X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=58d45ab43d6508619d34186b3f4a23f6d455ecc7;hp=bb4eb1dbfa0cd8d0c6924ab519912c834a1d2456;hb=refs%2Fheads%2Fpu;hpb=abfb661f35e99e99c09a94d84839356d905af080

diff --git a/udp_recv.c b/udp_recv.c
index bb4eb1db..f98a9664 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 /** \file udp_recv.c Paraslash's udp receiver */
 
 #include <netinet/in.h>
@@ -13,27 +9,27 @@
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <lopsub.h>
 
+#include "recv_cmd.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "portable_io.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "recv.h"
-#include "udp_recv.cmdline.h"
 #include "string.h"
 #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])
@@ -44,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;
@@ -72,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;
@@ -103,13 +99,6 @@ static void udp_recv_close(struct receiver_node *rn)
 	btr_pool_free(rn->btrp);
 }
 
-static void *udp_recv_parse_config(int argc, char **argv)
-{
-	struct udp_recv_args_info *tmp = para_calloc(sizeof(*tmp));
-	udp_recv_cmdline_parser(argc, argv, tmp);
-	return tmp;
-}
-
 /*
  * Perform AF-independent joining of multicast receive addresses.
  *
@@ -173,58 +162,33 @@ err:
 
 static int udp_recv_open(struct receiver_node *rn)
 {
-	struct udp_recv_args_info *c = rn->conf;
-	char  *iface = c->iface_given ? c->iface_arg : NULL;
+	struct lls_parse_result *lpr = rn->lpr;
+	const char *iface = RECV_CMD_OPT_STRING_VAL(UDP, IFACE, lpr);
+	const char *host = RECV_CMD_OPT_STRING_VAL(UDP, HOST, lpr);
+	uint32_t port = RECV_CMD_OPT_UINT32_VAL(UDP, PORT, lpr);
 	int ret;
 
-	ret = makesock(IPPROTO_UDP, 1, c->host_arg, c->port_arg, NULL);
+	ret = makesock(IPPROTO_UDP, true /* passive */, host, port, NULL);
 	if (ret < 0)
-		goto err;
+		return ret;
 	rn->fd = ret;
-
 	ret = mcast_receiver_setup(rn->fd, iface);
-	if (ret < 0) {
-		close(rn->fd);
+	if (ret < 0)
 		goto err;
-	}
-
 	ret = mark_fd_nonblocking(rn->fd);
-	if (ret < 0) {
-		close(rn->fd);
+	if (ret < 0)
 		goto err;
-	}
-	PARA_INFO_LOG("receiving from %s:%d, fd=%d\n", c->host_arg,
-		c->port_arg, rn->fd);
+	PARA_INFO_LOG("receiving from %s:%u, fd=%d\n", host, port, rn->fd);
 	rn->btrp = btr_pool_new("udp_recv", 320 * 1024);
 	return rn->fd;
 err:
+	close(rn->fd);
 	return ret;
 }
 
-static void udp_recv_free_config(void *conf)
-{
-	udp_recv_cmdline_parser_free(conf);
-	free(conf);
-}
-
-/**
- * The init function of the udp receiver.
- *
- * \param r Pointer to the receiver struct to initialize.
- *
- * Initialize all function pointers of \a r.
- */
-void udp_recv_init(struct receiver *r)
-{
-	struct udp_recv_args_info dummy;
-
-	udp_recv_cmdline_parser_init(&dummy);
-	r->open = udp_recv_open;
-	r->close = udp_recv_close;
-	r->pre_select = udp_recv_pre_select;
-	r->post_select = udp_recv_post_select;
-	r->parse_config = udp_recv_parse_config;
-	r->free_config = udp_recv_free_config;
-	r->help = (struct ggo_help)DEFINE_GGO_HELP(udp_recv);
-	udp_recv_cmdline_parser_free(&dummy);
-}
+const struct receiver lsg_recv_cmd_com_udp_user_data = {
+	.open = udp_recv_open,
+	.close = udp_recv_close,
+	.pre_monitor = udp_recv_pre_monitor,
+	.post_monitor = udp_recv_post_monitor,
+};