fix container_of() on ustream callbacks

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index 384f8d4..bcb6897 100644 (file)
--- a/client.c
+++ b/client.c
@@ -92,11 +92,18 @@ 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);
+       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);
 }
 
+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);
@@ -108,8 +115,8 @@ void uh_request_done(struct client *cl)
                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)
@@ -479,14 +486,14 @@ void uh_client_notify_state(struct client *cl)
 
 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)
 {
-       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);
@@ -494,7 +501,7 @@ static void client_ustream_write_cb(struct ustream *s, int bytes)
 
 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);
 }
@@ -550,7 +557,7 @@ bool uh_accept_client(int fd, bool tls)
        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;