X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=6580fe9b734e518a0e1e9f164dca7e466b30bc65;hp=deca7162bfecc40e93dd0d7431f7bae9218f23ec;hb=c2eecbd1d8445b6605f0d07aea0ed9a66499e5dd;hpb=2a8029478dfc65f0c935d864faf4aea9e3deb27d

diff --git a/dccp_recv.c b/dccp_recv.c
index deca7162..6580fe9b 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -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
@@ -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);
-	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);
@@ -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)
 {
-	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);
 }
 
@@ -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;
 
+	t->ret = -E_DCCP_RECV_EOF;
+	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;
 }
 
 /**