X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=943b8283e6a0f135c3b0edbc3cd5de44e250cedb;hp=3be5365fe818f4b14133a87c2d561df7b9feec59;hb=4c80bf4a2082c4922094f7e8ce75193edb6be80f;hpb=8cec3d1edb26b4861e2b5bdbb9f70241cdd7f03b

diff --git a/dccp_recv.c b/dccp_recv.c
index 3be5365f..943b8283 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -98,6 +98,7 @@ static int dccp_recv_open(struct receiver_node *rn)
 	ret = -E_DCCP_CONNECT;
 	if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
 		goto err_out;
+	mark_fd_nonblock(pdd->fd);
 	return 1;
 err_out:
 	dccp_recv_close(rn);
@@ -125,8 +126,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 +135,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;
 }
 
 /**