X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=b1e2f48da54d57662fab5b8a18a2190044e77790;hp=f3b9120b3dfd75ef913a1d4b1f6a2b968e887ba1;hb=87e49928cf48ae6368e65a27cfe1a62e33a19e48;hpb=73f02f72cb49baebff3e0f6946750a5bc0693321

diff --git a/dccp_send.c b/dccp_send.c
index f3b9120b..b1e2f48d 100644
--- a/dccp_send.c
+++ b/dccp_send.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.
  */
@@ -51,7 +51,7 @@ struct dccp_client {
 	struct chunk_queue *cq;
 };
 
-static void dccp_pre_select( int *max_fileno, fd_set *rfds,
+static void dccp_pre_select(int *max_fileno, fd_set *rfds,
 		__a_unused fd_set *wfds)
 {
 	if (listen_fd < 0)
@@ -63,32 +63,40 @@ static void dccp_pre_select( int *max_fileno, fd_set *rfds,
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct dccp_client *dc;
-	int ret;
+	int ret, fd;
 
-	if (!FD_ISSET(listen_fd, rfds))
+	if (listen_fd < 0 || !FD_ISSET(listen_fd, rfds))
 		return;
 	ret = para_accept(listen_fd, NULL, 0);
 	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		return;
 	}
+	fd = ret;
 	/*
 	 * Bypass unused CCID paths: the sender does not receive application data
 	 * from the client; by shutting down this unused communication path we can
 	 * reduce processing costs a bit. See analogous comment in dccp_recv.c.
 	 */
-	if (shutdown(ret, SHUT_RD) < 0) {
+	if (shutdown(fd, SHUT_RD) < 0) {
 		PARA_ERROR_LOG("shutdown(SHUT_RD): %s\n", strerror(errno));
-		return;
+		goto err;
+	}
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		goto err;
 	}
 	dc = para_calloc(sizeof(struct dccp_client));
-	dc->fd = ret;
+	dc->fd = fd;
 	dc->name = make_message("%s", remote_name(dc->fd));
 	PARA_NOTICE_LOG("connection from %s\n", dc->name);
 	para_list_add(&dc->node, &clients);
 	add_close_on_fork_list(dc->fd);
-	mark_fd_nonblocking(dc->fd);
 	dc->cq = cq_new(DCCP_MAX_PENDING_BYTES);
+	return;
+err:
+	close(fd);
 }
 
 static int dccp_open(void)
@@ -98,8 +106,12 @@ static int dccp_open(void)
 	if (ret < 0)
 		return ret;
 	listen_fd = ret;
+	ret = mark_fd_nonblocking(listen_fd);
+	if (ret < 0) {
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+		exit(EXIT_FAILURE);
+	}
 	add_close_on_fork_list(listen_fd);
-	mark_fd_nonblocking(listen_fd);
 	return 1;
 }
 
@@ -126,17 +138,15 @@ static int dccp_write(int fd, const char *buf, size_t len)
 	while (written < len) {
 		ret = write(fd, buf + written, PARA_MIN(1024, len - written));
 		/*
-		 * Error handling: CCID3 has a sending wait queue which fills up and is
-		 * emptied asynchronously. The EAGAIN case means that there is currently
-		 * no space in the wait queue, but this can change at any moment and is
-		 * thus not an error condition.
+		 * Error handling: CCID3 has a sending wait queue which fills
+		 * up and is emptied asynchronously. The EAGAIN case means that
+		 * there is currently no space in the wait queue, but this can
+		 * change at any moment and is thus not an error condition.
 		 */
 		if (ret < 0 && errno == EAGAIN)
 			return written;
-		if (ret < 0) {
-			PARA_ERROR_LOG("%s\n", strerror(errno));
-			return -E_DCCP_WRITE;
-		}
+		if (ret < 0)
+			return -ERRNO_TO_PARA_ERROR(errno);
 		written += ret;
 	}
 	return written;
@@ -178,13 +188,13 @@ static void dccp_send(long unsigned current_chunk,
 	struct dccp_client *dc, *tmp;
 	int ret;
 	char *header_buf;
-	size_t header_len;
 
 	if (listen_fd < 0 || !len)
 		return;
 
 	list_for_each_entry_safe(dc, tmp, &clients, node) {
 		if (!dc->header_sent && current_chunk) {
+			size_t header_len;
 			header_buf = vss_get_header(&header_len);
 			if (header_buf && header_len > 0) {
 				if (queue_chunk_or_shutdown(dc, -1U, 0) < 0)
@@ -200,7 +210,7 @@ static void dccp_send(long unsigned current_chunk,
 //		PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
 		ret = dccp_write(dc->fd, buf, len);
 		if (ret < 0) {
-			PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
+			PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 			dccp_shutdown_client(dc);
 			continue;
 		}
@@ -262,9 +272,6 @@ void dccp_send_init(struct sender *s)
 	s->client_cmds[SENDER_DELETE] = NULL;
 	self = s;
 	ret = dccp_open();
-	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-		s->status = SENDER_OFF;
-	} else
-		s->status = SENDER_ON;
+	if (ret < 0)
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 }