vss.c: Kill check for get_file_info == NULL
[paraslash.git] / dccp_recv.c
index deca716..6580fe9 100644 (file)
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -95,9 +95,13 @@ static int dccp_recv_open(struct receiver_node *rn)
        if (ret < 0)
                goto err_out;
        PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, conf->port_arg);
        if (ret < 0)
                goto err_out;
        PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, conf->port_arg);
-       ret = -E_DCCP_CONNECT;
-       if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
+       ret = connect(pdd->fd, ai->ai_addr, ai->ai_addrlen);
+       freeaddrinfo(ai);
+       if (ret < 0) {
+               ret = -E_DCCP_CONNECT;
                goto err_out;
                goto err_out;
+       }
+       mark_fd_nonblock(pdd->fd);
        return 1;
 err_out:
        dccp_recv_close(rn);
        return 1;
 err_out:
        dccp_recv_close(rn);
@@ -121,10 +125,10 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 
 static void dccp_recv_pre_select(struct sched *s, struct task *t)
 {
 
 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);
 }
 
        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
@@ -133,21 +137,27 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
        struct receiver_node *rn = t->private_data;
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        struct receiver_node *rn = t->private_data;
        struct private_dccp_recv_data *pdd = rn->private_data;
 
+       t->ret = -E_DCCP_RECV_EOF;
+       if (rn->output_eof && *rn->output_eof)
+               goto out;
        t->ret = 1;
        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)
        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) {
        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;
                if (!t->ret)
                        t->ret = -E_DCCP_RECV_EOF;
-               return;
+               goto out;
        }
        rn->loaded += t->ret;
        }
        rn->loaded += t->ret;
+       return;
+out:
+       if (t->ret < 0)
+               rn->eof = 1;
 }
 
 /**
 }
 
 /**