X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=b803b4976b52d0e89fdae2c3ee7edbdb8a0a311b;hp=f4912e1e5322f1adf79cb805a2782ba7edbecdad;hb=eacc2982fbf7e0c0b69508b57f85e839d1ba1013;hpb=58ce610c5a46eb03810d8a93b10d5bc51bc10b12

diff --git a/udp_recv.c b/udp_recv.c
index f4912e1e..b803b497 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -1,13 +1,18 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file udp_recv.c Paraslash's udp receiver */
 
+#include <netinet/in.h>
 #include <regex.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -15,18 +20,18 @@
 #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"
-#include "buffer_tree.h"
 
-static void udp_recv_pre_select(struct sched *s, struct task *t)
+static void udp_recv_pre_select(struct sched *s, void *context)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = context;
 
-	if (generic_recv_pre_select(s, t) <= 0)
+	if (generic_recv_pre_select(s, rn) <= 0)
 		return;
 	para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
 }
@@ -43,21 +48,21 @@ static int udp_check_eof(size_t sz, struct iovec iov[2])
 	}
 	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,
+	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;
 }
 
-static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
+static int udp_recv_post_select(__a_unused struct sched *s, void *context)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = context;
 	struct btr_node *btrn = rn->btrn;
 	size_t num_bytes;
 	struct iovec iov[2];
 	int ret, readv_ret, iovcnt;
 
-	ret = task_get_notification(t);
+	ret = task_get_notification(rn->task);
 	if (ret < 0)
 		goto out;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
@@ -83,12 +88,12 @@ static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 	}
 	ret = readv_ret;
 out:
-	if (ret >= 0)
-		return;
-	btr_remove_node(&rn->btrn);
-	t->error = ret;
-	close(rn->fd);
-	rn->fd = -1;
+	if (ret < 0) {
+		btr_remove_node(&rn->btrn);
+		close(rn->fd);
+		rn->fd = -1;
+	}
+	return ret;
 }
 
 static void udp_recv_close(struct receiver_node *rn)
@@ -100,15 +105,9 @@ static void udp_recv_close(struct receiver_node *rn)
 
 static void *udp_recv_parse_config(int argc, char **argv)
 {
-	int ret;
-	struct udp_recv_args_info *tmp =
-		para_calloc(sizeof(struct udp_recv_args_info));
-
-	ret = udp_recv_cmdline_parser(argc, argv, tmp)? -E_UDP_SYNTAX : 1;
-	if (ret >= 0)
-		return tmp;
-	free(tmp);
-	return NULL;
+	struct udp_recv_args_info *tmp = para_calloc(sizeof(*tmp));
+	udp_recv_cmdline_parser(argc, argv, tmp);
+	return tmp;
 }
 
 /*
@@ -226,9 +225,6 @@ void udp_recv_init(struct receiver *r)
 	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) {
-		.short_help = udp_recv_args_info_help,
-		.detailed_help = udp_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(udp_recv);
 	udp_recv_cmdline_parser_free(&dummy);
 }