X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=udp_recv.c;h=f98a9664aec2d1ee3d8129e70442468423fa79a8;hb=8e2dd1ba754a0259ca89f9ece1c1cd25bea4c8bd;hp=67846b141926e80baba083edda9177fa8b3b6acf;hpb=e5de57de1b8bf1df96c152fc92f5a49f75d6d96c;p=paraslash.git

diff --git a/udp_recv.c b/udp_recv.c
index 67846b14..f98a9664 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -23,13 +23,13 @@
 #include "net.h"
 #include "fd.h"
 
-static void udp_recv_pre_select(struct sched *s, void *context)
+static void udp_recv_pre_monitor(struct sched *s, void *context)
 {
 	struct receiver_node *rn = context;
 
-	if (generic_recv_pre_select(s, rn) <= 0)
+	if (generic_recv_pre_monitor(s, rn) <= 0)
 		return;
-	para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
+	sched_monitor_readfd(rn->fd, s);
 }
 
 static int udp_check_eof(size_t sz, struct iovec iov[2])
@@ -40,17 +40,17 @@ static int udp_check_eof(size_t sz, struct iovec iov[2])
 		if (memcmp(iov[0].iov_base, FEC_EOF_PACKET,
 				FEC_EOF_PACKET_LEN) != 0)
 			return 0;
-		return -E_RECV_EOF;
+		return -E_EOF;
 	}
 	if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, iov[0].iov_len) != 0)
 		return 0;
 	if (memcmp(iov[1].iov_base, &FEC_EOF_PACKET[iov[0].iov_len],
 			FEC_EOF_PACKET_LEN - iov[0].iov_len) != 0)
 		return 0;
-	return -E_RECV_EOF;
+	return -E_EOF;
 }
 
-static int udp_recv_post_select(__a_unused struct sched *s, void *context)
+static int udp_recv_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct receiver_node *rn = context;
 	struct btr_node *btrn = rn->btrn;
@@ -68,7 +68,7 @@ static int udp_recv_post_select(__a_unused struct sched *s, void *context)
 	ret = -E_UDP_OVERRUN;
 	if (iovcnt == 0)
 		goto out;
-	ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes);
+	ret = readv_nonblock(rn->fd, iov, iovcnt, &num_bytes);
 	if (num_bytes == 0)
 		goto out;
 	readv_ret = ret;
@@ -168,7 +168,7 @@ static int udp_recv_open(struct receiver_node *rn)
 	uint32_t port = RECV_CMD_OPT_UINT32_VAL(UDP, PORT, lpr);
 	int ret;
 
-	ret = makesock(IPPROTO_UDP, 1, host, port, NULL);
+	ret = makesock(IPPROTO_UDP, true /* passive */, host, port, NULL);
 	if (ret < 0)
 		return ret;
 	rn->fd = ret;
@@ -186,10 +186,9 @@ err:
 	return ret;
 }
 
-/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_udp_user_data = {
 	.open = udp_recv_open,
 	.close = udp_recv_close,
-	.pre_select = udp_recv_pre_select,
-	.post_select = udp_recv_post_select,
+	.pre_monitor = udp_recv_pre_monitor,
+	.post_monitor = udp_recv_post_monitor,
 };