X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=07f616657a7db4ca0dfe5b9d318f542c215a18c6;hp=c0618602571975fbb6ab17b80f633eb8d33aaca0;hb=53a27fb91166a7734f0768721b2cef91f0f6172e;hpb=73f02f72cb49baebff3e0f6946750a5bc0693321

diff --git a/dccp_recv.c b/dccp_recv.c
index c0618602..07f61665 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -57,24 +57,32 @@ static int dccp_recv_open(struct receiver_node *rn)
 {
 	struct private_dccp_recv_data *pdd;
 	struct dccp_recv_args_info *conf = rn->conf;
-	int ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg);
+	int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg,
+		conf->port_arg);
 
 	if (ret < 0)
 		return ret;
+	fd = ret;
 	/*
-	 * Disable unused CCIDs: the receiver does not send any application data to the
-	 * server. By shutting down this unused path we reduce internal processing costs,
-	 * as the unused CCIDs (in the kernel) are then bypassed.
+	 * Disable unused CCIDs: the receiver does not send any application
+	 * data to the server. By shutting down this unused path we reduce
+	 * internal processing costs, as the unused CCIDs (in the kernel) are
+	 * then bypassed.
 	 */
-	if (shutdown(ret, SHUT_WR) < 0)
-		return -ERRNO_TO_PARA_ERROR(errno);
-
+	if (shutdown(fd, SHUT_WR) < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		goto err;
+	}
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0)
+		goto err;
 	rn->buf = para_calloc(DCCP_BUFSIZE);
 	rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
-
-	pdd->fd = ret;
-	mark_fd_nonblocking(pdd->fd);
+	pdd->fd = fd;
 	return 1;
+err:
+	close(fd);
+	return ret;
 }
 
 static void dccp_shutdown(void)