X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=47351afbae731a08498f08692074b1670a05c490;hp=3be5365fe818f4b14133a87c2d561df7b9feec59;hb=35726e230f83270ef01000fc57328101a8b0d89f;hpb=8cec3d1edb26b4861e2b5bdbb9f70241cdd7f03b

diff --git a/dccp_recv.c b/dccp_recv.c
index 3be5365f..47351afb 100644
--- 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 */
@@ -23,6 +11,9 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "error.h"
 #include "dccp.h"
@@ -95,9 +86,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 = PARA_CONNECT(pdd->fd, ai->ai_addr);
+	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 +120,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);
 }
 
@@ -136,25 +129,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;
 }
 
 /**