ubus: duplicate request buffer to avoid memory corruption with multiple requests

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index 384f8d4..a971b3b 100644 (file)
--- a/client.c
+++ b/client.c
@@ -73,6 +73,8 @@ static void uh_dispatch_done(struct client *cl)
 {
        if (cl->dispatch.free)
                cl->dispatch.free(cl);
 {
        if (cl->dispatch.free)
                cl->dispatch.free(cl);

+       if (cl->dispatch.req_free)
+               cl->dispatch.req_free(cl);

 }
 
 static void client_timeout(struct uloop_timeout *timeout)
 }
 
 static void client_timeout(struct uloop_timeout *timeout)


@@ -92,24 +94,30 @@ static void uh_set_client_timeout(struct client *cl, int timeout)
 static void uh_keepalive_poll_cb(struct uloop_timeout *timeout)
 {
        struct client *cl = container_of(timeout, struct client, timeout);
 static void uh_keepalive_poll_cb(struct uloop_timeout *timeout)
 {
        struct client *cl = container_of(timeout, struct client, timeout);

+       int sec = cl->requests > 0 ? conf.http_keepalive : conf.network_timeout;

 
 

-       uh_set_client_timeout(cl, conf.http_keepalive);
+       uh_set_client_timeout(cl, sec);

        cl->us->notify_read(cl->us, 0);
 }
 
        cl->us->notify_read(cl->us, 0);
 }
 

+static void uh_poll_connection(struct client *cl)
+{
+       cl->timeout.cb = uh_keepalive_poll_cb;
+       uloop_timeout_set(&cl->timeout, 1);
+}
+

 void uh_request_done(struct client *cl)
 {
        uh_chunk_eof(cl);
        uh_dispatch_done(cl);
 void uh_request_done(struct client *cl)
 {
        uh_chunk_eof(cl);
        uh_dispatch_done(cl);

-       cl->us->notify_write = NULL;

        memset(&cl->dispatch, 0, sizeof(cl->dispatch));
 
        if (!conf.http_keepalive || cl->request.connection_close)
                return uh_connection_close(cl);
 
        cl->state = CLIENT_STATE_INIT;
        memset(&cl->dispatch, 0, sizeof(cl->dispatch));
 
        if (!conf.http_keepalive || cl->request.connection_close)
                return uh_connection_close(cl);
 
        cl->state = CLIENT_STATE_INIT;

-       cl->timeout.cb = uh_keepalive_poll_cb;
-       uloop_timeout_set(&cl->timeout, 1);
+       cl->requests++;
+       uh_poll_connection(cl);

 }
 
 void __printf(4, 5)
 }
 
 void __printf(4, 5)


@@ -186,6 +194,11 @@ static bool client_init_cb(struct client *cl, char *buf, int len)
        if (!newline)
                return false;
 
        if (!newline)
                return false;
 

+       if (newline == buf) {
+               ustream_consume(cl->us, 2);
+               return true;
+       }
+

        *newline = 0;
        blob_buf_init(&cl->hdr, 0);
        cl->state = client_parse_request(cl, buf);
        *newline = 0;
        blob_buf_init(&cl->hdr, 0);
        cl->state = client_parse_request(cl, buf);


@@ -479,14 +492,14 @@ void uh_client_notify_state(struct client *cl)
 
 static void client_ustream_read_cb(struct ustream *s, int bytes)
 {
 
 static void client_ustream_read_cb(struct ustream *s, int bytes)
 {

-       struct client *cl = container_of(s, struct client, sfd);
+       struct client *cl = container_of(s, struct client, sfd.stream);

 
        uh_client_read_cb(cl);
 }
 
 static void client_ustream_write_cb(struct ustream *s, int bytes)
 {
 
        uh_client_read_cb(cl);
 }
 
 static void client_ustream_write_cb(struct ustream *s, int bytes)
 {

-       struct client *cl = container_of(s, struct client, sfd);
+       struct client *cl = container_of(s, struct client, sfd.stream);

 
        if (cl->dispatch.write_cb)
                cl->dispatch.write_cb(cl);
 
        if (cl->dispatch.write_cb)
                cl->dispatch.write_cb(cl);


@@ -494,7 +507,7 @@ static void client_ustream_write_cb(struct ustream *s, int bytes)
 
 static void client_notify_state(struct ustream *s)
 {
 
 static void client_notify_state(struct ustream *s)
 {

-       struct client *cl = container_of(s, struct client, sfd);
+       struct client *cl = container_of(s, struct client, sfd.stream);

 
        uh_client_notify_state(cl);
 }
 
        uh_client_notify_state(cl);
 }


@@ -550,12 +563,13 @@ bool uh_accept_client(int fd, bool tls)
        cl->us->string_data = true;
        ustream_fd_init(&cl->sfd, sfd);
 
        cl->us->string_data = true;
        ustream_fd_init(&cl->sfd, sfd);
 

-       uh_set_client_timeout(cl, conf.network_timeout);
+       uh_poll_connection(cl);

        list_add_tail(&cl->list, &clients);
 
        next_client = NULL;
        n_clients++;
        cl->id = client_id++;
        list_add_tail(&cl->list, &clients);
 
        next_client = NULL;
        n_clients++;
        cl->id = client_id++;

+       cl->tls = tls;

 
        return true;
 }
 
        return true;
 }