add documentation for struct osx_buffer

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index a9e30e8e5676006f4e35f96668c6dc831a7cab7c..943b8283e6a0f135c3b0edbc3cd5de44e250cedb 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -98,6 +98,7 @@ static int dccp_recv_open(struct receiver_node *rn)
        ret = -E_DCCP_CONNECT;
        if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
                goto err_out;
+       mark_fd_nonblock(pdd->fd);
        return 1;
 err_out:
        dccp_recv_close(rn);
@@ -121,10 +122,10 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 
 static void dccp_recv_pre_select(struct sched *s, struct task *t)
 {
-       struct private_dccp_recv_data *pdd = t->private_data;
+       struct receiver_node *rn = t->private_data;
+       struct private_dccp_recv_data *pdd = rn->private_data;
 
-       if (!pdd)
-               return ;
+       t->ret = 1;
        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
@@ -134,25 +135,26 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        t->ret = -E_DCCP_RECV_EOF;
-       if (rn->output_eof && *rn->output_eof) {
-               rn->eof = 1;
-               return;
-       }
+       if (rn->output_eof && *rn->output_eof)
+               goto out;
        t->ret = 1;
-       if (!s->select_ret || !pdd || !FD_ISSET(pdd->fd, &s->rfds))
-               return; /* nothing to do */
+       if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds))
+               goto out; /* nothing to do */
        t->ret = -E_DCCP_OVERRUN;
        if (rn->loaded >= DCCP_BUFSIZE)
-               return;
+               goto out;
        t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
                DCCP_BUFSIZE - rn->loaded);
        if (t->ret <= 0) {
-               rn->eof = 1;
                if (!t->ret)
                        t->ret = -E_DCCP_RECV_EOF;
-               return;
+               goto out;
        }
        rn->loaded += t->ret;
+       return;
+out:
+       if (t->ret < 0)
+               rn->eof = 1;
 }
 
 /**