http_recv: Switch to nonblock API.

This gets rid of another call to FD_ISSET().

diff --git a/http_recv.c b/http_recv.c
index 636e224158a965ab68c0685c93411fe4767ea991..9ade8dfbc4063d2f9179c190c2e8233bf22c56ae 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -95,7 +95,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        struct btr_node *btrn = rn->btrn;
        int ret;
        char *buf;
-       size_t sz;
+       size_t sz, n;
 
        t->error = 0;
        ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
@@ -130,13 +130,11 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        sz = btr_pool_get_buffer(phd->btrp, &buf);
        if (sz == 0)
                goto err;
-       ret = recv_bin_buffer(phd->fd, buf, sz);
-       if (ret == 0)
-               ret = -E_RECV_EOF;
-       if (ret < 0)
-               goto err;
-       btr_add_output_pool(phd->btrp, ret, btrn);
-       return;
+       ret = read_nonblock(phd->fd, buf, sz, &s->rfds, &n);
+       if (n > 0)
+               btr_add_output_pool(phd->btrp, n, btrn);
+       if (ret >= 0)
+               return;
 err:
        btr_remove_node(rn->btrn);
        t->error = ret;