http: assume data EOF if the connection terminates

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

diff --git a/uclient-http.c b/uclient-http.c
index 7e930d7..5e5f996 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -19,6 +19,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <stdint.h>

+#include <fcntl.h>

 
 #include <libubox/ustream.h>
 #include <libubox/ustream-ssl.h>
 
 #include <libubox/ustream.h>
 #include <libubox/ustream-ssl.h>


@@ -107,6 +108,8 @@ static const char * const uclient_http_prefix[] = {
        [__PREFIX_MAX] = NULL
 };
 
        [__PREFIX_MAX] = NULL
 };
 

+static int uclient_http_connect(struct uclient *cl);
+

 static int uclient_do_connect(struct uclient_http *uh, const char *port)
 {
        socklen_t sl;
 static int uclient_do_connect(struct uclient_http *uh, const char *port)
 {
        socklen_t sl;


@@ -115,18 +118,18 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
        if (uh->uc.url->port)
                port = uh->uc.url->port;
 
        if (uh->uc.url->port)
                port = uh->uc.url->port;
 

-       fd = usock(USOCK_TCP | USOCK_NONBLOCK, uh->uc.url->host, port);
+       memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+
+       fd = usock_inet(USOCK_TCP, uh->uc.url->host, port, &uh->uc.remote_addr);

        if (fd < 0)
                return -1;
 
        if (fd < 0)
                return -1;
 

+       fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);

        ustream_fd_init(&uh->ufd, fd);
 
        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);
        sl = sizeof(uh->uc.local_addr);

+       memset(&uh->uc.local_addr, 0, sl);

        getsockname(fd, &uh->uc.local_addr.sa, &sl);
        getsockname(fd, &uh->uc.local_addr.sa, &sl);

-       getpeername(fd, &uh->uc.remote_addr.sa, &sl);

 
        return 0;
 }
 
        return 0;
 }


@@ -189,6 +192,9 @@ static void uclient_notify_eof(struct uclient_http *uh)
                        return;
        }
 
                        return;
        }
 

+       if (uh->content_length < 0 && uh->read_chunked >= 0)
+               uh->uc.data_eof = true;
+

        uclient_backend_set_eof(&uh->uc);
 
        if (uh->connection_close)
        uclient_backend_set_eof(&uh->uc);
 
        if (uh->connection_close)


@@ -212,6 +218,7 @@ static void uclient_http_reset_state(struct uclient_http *uh)
 
 static void uclient_http_init_request(struct uclient_http *uh)
 {
 
 static void uclient_http_init_request(struct uclient_http *uh)
 {

+       uh->seq++;

        uclient_http_reset_state(uh);
        blob_buf_init(&uh->meta, 0);
 }
        uclient_http_reset_state(uh);
        blob_buf_init(&uh->meta, 0);
 }


@@ -540,6 +547,9 @@ uclient_http_send_headers(struct uclient_http *uh)
        if (uh->state >= HTTP_STATE_HEADERS_SENT)
                return;
 
        if (uh->state >= HTTP_STATE_HEADERS_SENT)
                return;
 

+       if (uh->uc.proxy_url)
+               url = uh->uc.proxy_url;
+

        ustream_printf(uh->us,
                "%s %s HTTP/1.1\r\n"
                "Host: %s\r\n",
        ustream_printf(uh->us,
                "%s %s HTTP/1.1\r\n"
                "Host: %s\r\n",


@@ -547,7 +557,7 @@ uclient_http_send_headers(struct uclient_http *uh)
                url->location, url->host);
 
        blobmsg_for_each_attr(cur, uh->headers.head, rem)
                url->location, url->host);
 
        blobmsg_for_each_attr(cur, uh->headers.head, rem)

-               ustream_printf(uh->us, "%s: %s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
+               ustream_printf(uh->us, "%s: %s\r\n", blobmsg_name(cur), (char *) blobmsg_data(cur));

 
        if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
                ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");
 
        if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
                ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");


@@ -562,6 +572,7 @@ uclient_http_send_headers(struct uclient_http *uh)
 static void uclient_http_headers_complete(struct uclient_http *uh)
 {
        enum auth_type auth_type = uh->auth_type;
 static void uclient_http_headers_complete(struct uclient_http *uh)
 {
        enum auth_type auth_type = uh->auth_type;

+       int seq = uh->uc.seq;

 
        uh->state = HTTP_STATE_RECV_DATA;
        uh->uc.meta = uh->meta.head;
 
        uh->state = HTTP_STATE_RECV_DATA;
        uh->uc.meta = uh->meta.head;


@@ -569,7 +580,7 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
 
        if (auth_type == AUTH_TYPE_UNKNOWN && uh->uc.status_code == 401 &&
            (uh->req_type == REQ_HEAD || uh->req_type == REQ_GET)) {
 
        if (auth_type == AUTH_TYPE_UNKNOWN && uh->uc.status_code == 401 &&
            (uh->req_type == REQ_HEAD || uh->req_type == REQ_GET)) {

-               uclient_http_init_request(uh);
+               uclient_http_connect(&uh->uc);

                uclient_http_send_headers(uh);
                uh->state = HTTP_STATE_REQUEST_DONE;
                return;
                uclient_http_send_headers(uh);
                uh->state = HTTP_STATE_REQUEST_DONE;
                return;


@@ -578,7 +589,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->uc.cb->header_done)
                uh->uc.cb->header_done(&uh->uc);
 

-       if (uh->eof)
+       if (uh->eof || seq != uh->uc.seq)

                return;
 
        if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {
                return;
 
        if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {


@@ -655,28 +666,33 @@ static void __uclient_notify_read(struct uclient_http *uh)
                return;
 
        if (uh->state < HTTP_STATE_RECV_DATA) {
                return;
 
        if (uh->state < HTTP_STATE_RECV_DATA) {

-               char *sep;
+               char *sep, *next;

                int cur_len;
 
                do {
                int cur_len;
 
                do {

-                       sep = strstr(data, "\r\n");
+                       sep = strchr(data, '\n');

                        if (!sep)
                                break;
 
                        if (!sep)
                                break;
 

+                       next = sep + 1;
+                       if (sep > data && sep[-1] == '\r')
+                               sep--;
+

                        /* Check for multi-line HTTP headers */
                        if (sep > data) {
                        /* Check for multi-line HTTP headers */
                        if (sep > data) {

-                               if (!sep[2])
+                               if (!*next)

                                        return;
 
                                        return;
 

-                               if (isspace(sep[2]) && sep[2] != '\r') {
+                               if (isspace(*next) && *next != '\r' && *next != '\n') {

                                        sep[0] = ' ';
                                        sep[0] = ' ';

-                                       sep[1] = ' ';
+                                       if (sep + 1 < next)
+                                               sep[1] = ' ';

                                        continue;
                                }
                        }
 
                        *sep = 0;
                                        continue;
                                }
                        }
 
                        *sep = 0;

-                       cur_len = sep + 2 - data;
+                       cur_len = next - data;

                        uclient_parse_http_line(uh, data);
                        if (seq != uh->seq)
                                return;
                        uclient_parse_http_line(uh, data);
                        if (seq != uh->seq)
                                return;


@@ -732,6 +748,10 @@ static void uclient_notify_state(struct ustream *us)
 {
        struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
 
 {
        struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
 

+       if (uh->ufd.stream.write_error) {
+               uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
+               return;
+       }

        uclient_notify_eof(uh);
 }
 
        uclient_notify_eof(uh);
 }
 


@@ -826,6 +846,7 @@ 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;
        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;

+       uh->ussl.server_name = 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);
 
        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);
 


@@ -837,7 +858,7 @@ static int uclient_http_connect(struct uclient *cl)
        struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
        int ret;
 
        struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
        int ret;
 

-       if (!cl->eof || uh->disconnect)
+       if (!cl->eof || uh->disconnect || uh->connection_close)

                uclient_http_disconnect(uh);
 
        uclient_http_init_request(uh);
                uclient_http_disconnect(uh);
 
        uclient_http_init_request(uh);


@@ -1050,7 +1071,7 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
        return len;
 }
 
        return len;
 }
 

-bool uclient_http_redirect(struct uclient *cl)
+int uclient_http_redirect(struct uclient *cl)

 {
        struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
        struct blobmsg_policy location = {
 {
        struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
        struct blobmsg_policy location = {


@@ -1082,7 +1103,9 @@ bool uclient_http_redirect(struct uclient *cl)
 
        free(cl->url);
        cl->url = url;
 
        free(cl->url);
        cl->url = url;

-       uclient_http_connect(cl);
+       if (uclient_http_connect(cl))
+               return -1;
+

        uclient_http_request_done(cl);
 
        return true;
        uclient_http_request_done(cl);
 
        return true;


@@ -1114,6 +1137,7 @@ const struct uclient_backend uclient_backend_http = {
        .connect = uclient_http_connect,
        .disconnect = uclient_http_request_disconnect,
        .update_url = uclient_http_free_url_state,
        .connect = uclient_http_connect,
        .disconnect = uclient_http_request_disconnect,
        .update_url = uclient_http_free_url_state,

+       .update_proxy_url = uclient_http_free_url_state,

 
        .read = uclient_http_read,
        .write = uclient_http_send_data,
 
        .read = uclient_http_read,
        .write = uclient_http_send_data,