X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=253586e1f7ee4f90867a157757a34a227458047a;hp=1f9df18955306c2c2449444f3c5a0317d1358a4b;hb=eeeab4239843e716b3fd4dd259985a4cd4c487a5;hpb=58864df1c0784c58e421949b67a091fd0a60e140

diff --git a/dccp_recv.c b/dccp_recv.c
index 1f9df189..253586e1 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,8 +11,13 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -53,6 +58,7 @@ static int dccp_recv_open(struct receiver_node *rn)
 	}
 
 	fd = makesock(IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg, fo);
+	flowopt_cleanup(fo);
 	free(ccids);
 	if (fd < 0)
 		return fd;
@@ -107,32 +113,30 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 {
 	struct dccp_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
-	if (!dccp_recv_cmdline_parser(argc, argv, tmp) &&
-	    dccp_recv_ccid_support_check(tmp))
-		return tmp;
-	free(tmp);
-	return NULL;
+	dccp_recv_cmdline_parser(argc, argv, tmp);
+	if (!dccp_recv_ccid_support_check(tmp))
+		exit(EXIT_FAILURE);
+	return tmp;
 }
 
-static void dccp_recv_pre_select(struct sched *s, struct task *t)
+static void dccp_recv_pre_select(struct sched *s, void *context)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = context;
 
-	t->error = 0;
-	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);
 }
 
-static int dccp_recv_post_select(struct sched *s, struct task *t)
+static int dccp_recv_post_select(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;
 	struct iovec iov[2];
 	int ret, iovcnt;
 	size_t num_bytes;
 
-	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);
@@ -181,9 +185,6 @@ void dccp_recv_init(struct receiver *r)
 	r->post_select = dccp_recv_post_select;
 	r->parse_config = dccp_recv_parse_config;
 	r->free_config = dccp_recv_free_config;
-	r->help = (struct ggo_help) {
-		.short_help = dccp_recv_args_info_help,
-		.detailed_help = dccp_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(dccp_recv);
 	dccp_recv_cmdline_parser_free(&dummy);
 }