09_fix-errno-usage.diff

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 0b62529f417352715d14304685565f1efeae581d..0a7b3c069271329152f131afa1f1334416473d10 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -47,6 +47,7 @@ static void dccp_recv_close(struct receiver_node *rn)
 
        if (pdd && pdd->fd > 0)
                close(pdd->fd);
+       btr_pool_free(pdd->btrp);
        free(rn->private_data);
        rn->private_data = NULL;
 }
@@ -56,9 +57,8 @@ static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;
        struct dccp_recv_args_info *conf = rn->conf;
-       int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg,
-               conf->port_arg);
-
+       int fd, ret = para_connect_simple(IPPROTO_DCCP, conf->host_arg,
+                                                       conf->port_arg);
        if (ret < 0)
                return ret;
        fd = ret;
@@ -110,9 +110,8 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_dccp_recv_data *pdd = rn->private_data;
        struct btr_node *btrn = rn->btrn;
-       int ret;
-       char *buf;
-       size_t sz;
+       struct iovec iov[2];
+       int ret, iovcnt;
 
        ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
        if (ret < 0)
@@ -121,16 +120,21 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
                return;
        if (!FD_ISSET(pdd->fd, &s->rfds))
                return; /* nothing to do */
+       iovcnt = btr_pool_get_buffers(pdd->btrp, iov);
        ret = -E_DCCP_OVERRUN;
-       sz = btr_pool_get_buffer(pdd->btrp, &buf);
-       if (sz == 0)
+       if (iovcnt == 0)
                goto err;
-       ret = recv_bin_buffer(pdd->fd, buf, sz);
+       ret = para_readv(pdd->fd, iov, iovcnt);
        if (ret == 0)
                ret = -E_RECV_EOF;
        if (ret < 0)
                goto err;
-       btr_add_output_pool(pdd->btrp, ret, btrn);
+       if (ret <= iov[0].iov_len) /* only the first buffer was filled */
+               btr_add_output_pool(pdd->btrp, ret, btrn);
+       else { /* both buffers contain data */
+               btr_add_output_pool(pdd->btrp, iov[0].iov_len, btrn);
+               btr_add_output_pool(pdd->btrp, ret - iov[0].iov_len, btrn);
+       }
        return;
 err:
        btr_remove_node(rn->btrn);
@@ -140,6 +144,7 @@ err:
 static void dccp_recv_free_config(void *conf)
 {
        dccp_recv_cmdline_parser_free(conf);
+       free(conf);
 }
 
 /**