uclient-http: use ustream_ssl without ustream_fd

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

diff --git a/uclient-http.c b/uclient-http.c
index 83c268f239137423741eeac8704eba64a3d2c36c..861aefb05e80676869ba1677bd1cb002a767b3c5 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -72,11 +72,14 @@ struct uclient_http {
        struct ustream_ssl_ctx *ssl_ctx;
        struct ustream *us;
 
-       struct ustream_fd ufd;
-       struct ustream_ssl ussl;
+       union {
+               struct ustream_fd ufd;
+               struct ustream_ssl ussl;
+       };
 
        struct uloop_timeout disconnect_t;
        unsigned int seq;
+       int fd;
 
        bool ssl_require_validation;
        bool ssl;
@@ -131,7 +134,7 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
                return -1;
 
        fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
-       ustream_fd_init(&uh->ufd, fd);
+       uh->fd = fd;
 
        sl = sizeof(uh->uc.local_addr);
        memset(&uh->uc.local_addr, 0, sl);
@@ -148,9 +151,10 @@ static void uclient_http_disconnect(struct uclient_http *uh)
 
        if (uh->ssl)
                ustream_free(&uh->ussl.stream);
-       ustream_free(&uh->ufd.stream);
-       if(uh->ufd.fd.fd)
-               close(uh->ufd.fd.fd);
+       else
+               ustream_free(&uh->ufd.stream);
+       if(uh->fd >= 0)
+               close(uh->fd >= 0);
        uh->us = NULL;
 }
 
@@ -822,6 +826,8 @@ static int uclient_setup_http(struct uclient_http *uh)
        struct ustream *us = &uh->ufd.stream;
        int ret;
 
+       memset(&uh->ufd, 0, sizeof(uh->ufd));
+       ustream_fd_init(&uh->ufd, uh->fd);
        uh->us = us;
        uh->ssl = false;
 
@@ -861,17 +867,23 @@ static void uclient_ssl_notify_state(struct ustream *us)
 static void uclient_ssl_notify_error(struct ustream_ssl *ssl, int error, const char *str)
 {
        struct uclient_http *uh = container_of(ssl, struct uclient_http, ussl);
+       struct uclient *uc = &uh->uc;
 
+       if (uc->cb->log_msg)
+               uc->cb->log_msg(uc, UCLIENT_LOG_SSL_ERROR, str);
        uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
 }
 
 static void uclient_ssl_notify_verify_error(struct ustream_ssl *ssl, int error, const char *str)
 {
        struct uclient_http *uh = container_of(ssl, struct uclient_http, ussl);
+       struct uclient *uc = &uh->uc;
 
        if (!uh->ssl_require_validation)
                return;
 
+       if (uc->cb->log_msg)
+               uc->cb->log_msg(uc, UCLIENT_LOG_SSL_VERIFY_ERROR, str);
        uclient_http_error(uh, UCLIENT_ERROR_SSL_INVALID_CERT);
 }
 
@@ -891,6 +903,7 @@ static int uclient_setup_https(struct uclient_http *uh)
        struct ustream *us = &uh->ussl.stream;
        int ret;
 
+       memset(&uh->ussl, 0, sizeof(uh->ussl));
        uh->ssl = true;
        uh->us = us;
 
@@ -909,7 +922,7 @@ static int uclient_setup_https(struct uclient_http *uh)
        uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
        uh->ussl.notify_connected = uclient_ssl_notify_connected;
        uh->ussl.server_name = uh->uc.url->host;
-       uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
+       uh->ssl_ops->init_fd(&uh->ussl, uh->fd, uh->ssl_ctx, false);
        uh->ssl_ops->set_peer_cn(&uh->ussl, uh->uc.url->host);
 
        return 0;
@@ -1077,8 +1090,12 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
                return 0;
 
        data = ustream_get_read_buf(uh->us, &read_len);
-       if (!data || !read_len)
-               return 0;
+       if (!data || !read_len) {
+               ustream_poll(uh->us);
+               data = ustream_get_read_buf(uh->us, &read_len);
+               if (!data || !read_len)
+                       return 0;
+       }
 
        data_end = data + read_len;
        read_len = 0;
@@ -1225,6 +1242,14 @@ int uclient_http_set_address_family(struct uclient *cl, int af)
        return 0;
 }
 
+static int
+uclient_http_pending_bytes(struct uclient *cl, bool write)
+{
+       struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+       return ustream_pending_data(uh->us, write);
+}
+
 const struct uclient_backend uclient_backend_http = {
        .prefix = uclient_http_prefix,
 
@@ -1238,4 +1263,5 @@ const struct uclient_backend uclient_backend_http = {
        .read = uclient_http_read,
        .write = uclient_http_send_data,
        .request = uclient_http_request_done,
+       .pending_bytes = uclient_http_pending_bytes,
 };