fix client state tracking and request complete handling

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index a28067e..a76d11e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -27,12 +27,18 @@ static LIST_HEAD(clients);
 int n_clients = 0;
 struct config conf = {};
 
-static const char *http_versions[] = {
+const char * const http_versions[] = {
        [UH_HTTP_VER_0_9] = "HTTP/0.9",
        [UH_HTTP_VER_1_0] = "HTTP/1.0",
        [UH_HTTP_VER_1_1] = "HTTP/1.1",
 };
 
+const char * const http_methods[] = {
+       [UH_HTTP_MSG_GET] = "GET",
+       [UH_HTTP_MSG_POST] = "POST",
+       [UH_HTTP_MSG_HEAD] = "HEAD",
+};
+
 void uh_http_header(struct client *cl, int code, const char *summary)
 {
        const char *enc = "Transfer-Encoding: chunked\r\n";
@@ -53,17 +59,15 @@ void uh_http_header(struct client *cl, int code, const char *summary)
 
 static void uh_connection_close(struct client *cl)
 {
-       cl->state = CLIENT_STATE_DONE;
+       cl->state = CLIENT_STATE_CLOSE;
        cl->us->eof = true;
        ustream_state_change(cl->us);
 }
 
 static void uh_dispatch_done(struct client *cl)
 {
-       if (cl->dispatch_free)
-               cl->dispatch_free(cl);
-       cl->dispatch_free = NULL;
-       cl->dispatch_close_fds = NULL;
+       if (cl->dispatch.free)
+               cl->dispatch.free(cl);
 }
 
 void uh_request_done(struct client *cl)
@@ -71,7 +75,7 @@ void uh_request_done(struct client *cl)
        uh_chunk_eof(cl);
        uh_dispatch_done(cl);
        cl->us->notify_write = NULL;
-       memset(&cl->data, 0, sizeof(cl->data));
+       memset(&cl->dispatch, 0, sizeof(cl->dispatch));
 
        if (cl->request.version != UH_HTTP_VER_1_1 || !conf.http_keepalive) {
                uh_connection_close(cl);
@@ -115,11 +119,21 @@ static void client_timeout(struct uloop_timeout *timeout)
        uh_connection_close(cl);
 }
 
+static int find_idx(const char * const *list, int max, const char *str)
+{
+       int i;
+
+       for (i = 0; i < max; i++)
+               if (!strcmp(list[i], str))
+                       return i;
+
+       return -1;
+}
+
 static int client_parse_request(struct client *cl, char *data)
 {
        struct http_request *req = &cl->request;
        char *type, *path, *version;
-       int i;
 
        type = strtok(data, " ");
        path = strtok(NULL, " ");
@@ -128,23 +142,11 @@ static int client_parse_request(struct client *cl, char *data)
                return CLIENT_STATE_DONE;
 
        req->url = path;
-       if (!strcmp(type, "GET"))
-               req->method = UH_HTTP_MSG_GET;
-       else if (!strcmp(type, "POST"))
-               req->method = UH_HTTP_MSG_POST;
-       else if (!strcmp(type, "HEAD"))
-               req->method = UH_HTTP_MSG_HEAD;
-       else
+       req->method = find_idx(http_methods, ARRAY_SIZE(http_methods), type);
+       if (req->method < 0)
                return CLIENT_STATE_DONE;
 
-       cl->request.version = -1;
-       i = array_size(http_versions);
-       while (i--) {
-               if (!strcmp(version, http_versions[i])) {
-                       cl->request.version = i;
-                       break;
-               }
-       }
+       req->version = find_idx(http_versions, ARRAY_SIZE(http_versions), version);
        if (cl->request.version < 0)
                return CLIENT_STATE_DONE;
 
@@ -172,29 +174,26 @@ static bool client_init_cb(struct client *cl, char *buf, int len)
 
 static void client_header_complete(struct client *cl)
 {
-       uh_handle_file_request(cl);
+       uh_handle_request(cl);
 }
 
-static int client_parse_header(struct client *cl, char *data)
+static void client_parse_header(struct client *cl, char *data)
 {
        char *name;
        char *val;
 
        if (!*data) {
                uloop_timeout_cancel(&cl->timeout);
+               cl->state = CLIENT_STATE_DATA;
                client_header_complete(cl);
-               return CLIENT_STATE_DATA;
+               return;
        }
 
-       val = strchr(data, ':');
-       if (!val)
-               return CLIENT_STATE_DONE;
-
-       *val = 0;
-       val++;
-
-       while (isspace(*val))
-               val++;
+       val = uh_split_header(data);
+       if (!val) {
+               cl->state = CLIENT_STATE_DONE;
+               return;
+       }
 
        for (name = data; *name; name++)
                if (isupper(*name))
@@ -202,7 +201,7 @@ static int client_parse_header(struct client *cl, char *data)
 
        blobmsg_add_string(&cl->hdr, data, val);
 
-       return CLIENT_STATE_HEADER;
+       cl->state = CLIENT_STATE_HEADER;
 }
 
 static bool client_data_cb(struct client *cl, char *buf, int len)
@@ -220,7 +219,7 @@ static bool client_header_cb(struct client *cl, char *buf, int len)
                return false;
 
        *newline = 0;
-       cl->state = client_parse_header(cl, buf);
+       client_parse_header(cl, buf);
        line_len = newline + 2 - buf;
        ustream_consume(cl->us, line_len);
        if (cl->state == CLIENT_STATE_DATA)
@@ -265,6 +264,7 @@ static void client_close(struct client *cl)
        ustream_free(&cl->sfd.stream);
        close(cl->sfd.fd.fd);
        list_del(&cl->list);
+       blob_buf_free(&cl->hdr);
        free(cl);
 
        uh_unblock_listeners();
@@ -281,17 +281,23 @@ static void client_ustream_write_cb(struct ustream *s, int bytes)
 {
        struct client *cl = container_of(s, struct client, sfd);
 
-       if (cl->dispatch_write_cb)
-               cl->dispatch_write_cb(cl);
+       if (cl->dispatch.write_cb)
+               cl->dispatch.write_cb(cl);
 }
 
 static void client_notify_state(struct ustream *s)
 {
        struct client *cl = container_of(s, struct client, sfd);
 
-       if (cl->state == CLIENT_STATE_CLOSE ||
-               (s->eof && !s->w.data_bytes) || s->write_error)
-               return client_close(cl);
+       if (!s->write_error) {
+               if (cl->state == CLIENT_STATE_DATA)
+                       return;
+
+               if (!s->eof || s->w.data_bytes)
+                       return;
+       }
+
+       return client_close(cl);
 }
 
 void uh_accept_client(int fd)
@@ -339,7 +345,7 @@ void uh_close_fds(void)
        uh_close_listen_fds();
        list_for_each_entry(cl, &clients, list) {
                close(cl->sfd.fd.fd);
-               if (cl->dispatch_close_fds)
-                       cl->dispatch_close_fds(cl);
+               if (cl->dispatch.close_fds)
+                       cl->dispatch.close_fds(cl);
        }
 }