net.h: add missing __printf_2_3 attribute to send_va_buffer()

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 49024bb07c8addf1bd0297012df889b52b5fb25f..f113968346e19c136fad2d764e8a1a1b31422c7d 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,19 +1,7 @@
 /*
- * 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file dccp_recv.c paraslash's dccp receiver */
@@ -95,9 +83,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);
-       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;
+       }
+       mark_fd_nonblock(pdd->fd);
        return 1;
 err_out:
        dccp_recv_close(rn);
@@ -125,8 +117,6 @@ static void dccp_recv_pre_select(struct sched *s, struct task *t)
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        t->ret = 1;
-       if (!pdd)
-               return;
        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
@@ -139,7 +129,7 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
        if (rn->output_eof && *rn->output_eof)
                goto out;
        t->ret = 1;
-       if (!s->select_ret || !pdd || !FD_ISSET(pdd->fd, &s->rfds))
+       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)