X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=e276343ea1aae1b2a750389c4c691170b9c3aa6e;hp=4f363ccb7f15b65273867526dcd43e9a98337b9c;hb=e4db7671a91a7552c642acc979f0eb278f8d467f;hpb=4d4379901a0a01859728d56795a7ab6ada9c876b

diff --git a/udp_recv.c b/udp_recv.c
index 4f363ccb..e276343e 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -32,7 +32,6 @@ struct private_udp_recv_data {
 	/** The socket file descriptor. */
 	int fd;
 	struct btr_pool *btrp;
-	struct timeval last_read_time;
 };
 
 static void udp_recv_pre_select(struct sched *s, struct task *t)
@@ -68,48 +67,36 @@ static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_udp_recv_data *purd = rn->private_data;
 	struct btr_node *btrn = rn->btrn;
-	size_t packet_size;
+	size_t num_bytes;
 	struct iovec iov[2];
-	int ret, iovcnt;
+	int ret, readv_ret, iovcnt;
 
 	t->error = 0;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-	if (ret < 0)
-		goto err;
-	if (ret == 0)
-		return;
-	if (!FD_ISSET(purd->fd, &s->rfds)) {
-		struct timeval tmp;
-		tv_add(&purd->last_read_time, &(struct timeval)EMBRACE(5, 0),
-			&tmp);
-		ret = -E_UDP_TIMEOUT;
-		if (tv_diff(now, &tmp, NULL) > 0)
-			goto err;
-		return;
-	}
+	if (ret <= 0)
+		goto out;
 	iovcnt = btr_pool_get_buffers(purd->btrp, iov);
 	ret = -E_UDP_OVERRUN;
 	if (iovcnt == 0)
-		goto err;
-	ret = para_readv(purd->fd, iov, iovcnt);
-	if (ret == 0)
-		ret = -E_RECV_EOF;
+		goto out;
+	ret = readv_nonblock(purd->fd, iov, iovcnt, &s->rfds, &num_bytes);
+	if (num_bytes == 0)
+		goto out;
+	readv_ret = ret;
+	ret = udp_check_eof(num_bytes, iov);
 	if (ret < 0)
-		goto err;
-	packet_size = ret;
-	ret = udp_check_eof(packet_size, iov);
-	if (ret < 0)
-		goto err;
-	purd->last_read_time = *now;
-	if (iov[0].iov_len >= packet_size)
-		btr_add_output_pool(purd->btrp, packet_size, btrn);
+		goto out;
+	if (iov[0].iov_len >= num_bytes)
+		btr_add_output_pool(purd->btrp, num_bytes, btrn);
 	else { /* both buffers contain data */
 		btr_add_output_pool(purd->btrp, iov[0].iov_len, btrn);
-		btr_add_output_pool(purd->btrp, packet_size - iov[0].iov_len,
+		btr_add_output_pool(purd->btrp, num_bytes - iov[0].iov_len,
 			btrn);
 	}
-	return;
-err:
+	ret = readv_ret;
+out:
+	if (ret >= 0)
+		return;
 	btr_remove_node(btrn);
 	t->error = ret;
 	close(purd->fd);
@@ -155,9 +142,11 @@ static int mcast_receiver_setup(int fd, const char *iface)
 
 	if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0)
 		goto err;
+	assert(ss.ss_family == AF_INET || ss.ss_family == AF_INET6);
 
 	if (iface != NULL && id == 0)
-		PARA_WARNING_LOG("could not resolve interface %s, using default", iface);
+		PARA_WARNING_LOG("could not resolve interface %s, using default\n",
+			iface);
 
 	switch (ss.ss_family) {
 	case AF_INET:
@@ -172,12 +161,13 @@ static int mcast_receiver_setup(int fd, const char *iface)
 
 			m4.imr_interface.s_addr	= INADDR_ANY;
 			if (id != 0)
-				PARA_ERROR_LOG("Setting IPv4 receiver mcast interface not supported.");
+				PARA_ERROR_LOG("Setting IPv4 receiver mcast interface not supported\n");
 
 #endif
-			m4.imr_multiaddr	= ((struct sockaddr_in *)&ss)->sin_addr;
+			m4.imr_multiaddr = ((struct sockaddr_in *)&ss)->sin_addr;
 
-			if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &m4, sizeof(m4)) < 0)
+			if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+					&m4, sizeof(m4)) < 0)
 				break;
 		}
 		return 0;
@@ -192,9 +182,6 @@ static int mcast_receiver_setup(int fd, const char *iface)
 				break;
 		}
 		return 0;
-	default:
-		PARA_ERROR_LOG("address family %d not supported", ss.ss_family);
-		return -E_ADDRESS_LOOKUP;
 	}
 err:
 	return -ERRNO_TO_PARA_ERROR(errno);
@@ -229,7 +216,6 @@ static int udp_recv_open(struct receiver_node *rn)
 	PARA_INFO_LOG("receiving from %s:%d, fd=%d\n", c->host_arg,
 		c->port_arg, purd->fd);
 	purd->btrp = btr_pool_new("udp_recv", 320 * 1024);
-	purd->last_read_time = *now;
 	return purd->fd;
 err:
 	free(rn->private_data);