X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=887801a92f3a30128928e95e5232d7c39d4a3b59;hp=9de618b2c2f018f428684f658626a1a6e5d00916;hb=f47f21ba8703dfbd05ad8faf1c75869ff7f97f38;hpb=2101e3b42eaacb7ea98cf549c4553dafdb10126a

diff --git a/dccp_send.c b/dccp_send.c
index 9de618b2..887801a9 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -32,7 +32,6 @@
 /** the list of connected clients **/
 static struct list_head clients;
 static int listen_fd = -1;
-static struct sender *self;
 
 /** Maximal number of bytes in a chunk queue. */
 #define DCCP_MAX_PENDING_BYTES 40000
@@ -51,7 +50,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,7 +62,7 @@ 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 (listen_fd < 0 || !FD_ISSET(listen_fd, rfds))
 		return;
@@ -72,23 +71,31 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 		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)
@@ -130,17 +137,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;
@@ -182,13 +187,10 @@ 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)
@@ -201,6 +203,8 @@ static void dccp_send(long unsigned current_chunk,
 			dccp_shutdown_client(dc);
 			continue;
 		}
+		if (!len)
+			continue;
 //		PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
 		ret = dccp_write(dc->fd, buf, len);
 		if (ret < 0) {
@@ -264,7 +268,6 @@ void dccp_send_init(struct sender *s)
 	s->client_cmds[SENDER_ALLOW] = NULL;
 	s->client_cmds[SENDER_ADD] = NULL;
 	s->client_cmds[SENDER_DELETE] = NULL;
-	self = s;
 	ret = dccp_open();
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));