X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=1c41fd3c0d0d9d09b745bbd48fdabc181c74fec4;hp=d5f3cadbcbd60fb6745b8e36d9701642d93994d6;hb=a713c13d1089170828403e98c57d3fba9aedf9a4;hpb=74c88020bd325865fe26ed25ea8ad0ace0924136

diff --git a/dccp_recv.c b/dccp_recv.c
index d5f3cadb..1c41fd3c 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-2014 Andre Noll <maan@systemlinux.org>
  *
  * 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,18 +113,16 @@ 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)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = task_context(t);
 
-	t->error = 0;
 	if (generic_recv_pre_select(s, t) <= 0)
 		return;
 	para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
@@ -126,7 +130,7 @@ static void dccp_recv_pre_select(struct sched *s, struct task *t)
 
 static int dccp_recv_post_select(struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = task_context(t);
 	struct btr_node *btrn = rn->btrn;
 	struct iovec iov[2];
 	int ret, iovcnt;
@@ -178,12 +182,9 @@ void dccp_recv_init(struct receiver *r)
 	r->open = dccp_recv_open;
 	r->close = dccp_recv_close;
 	r->pre_select = dccp_recv_pre_select;
-	r->new_post_select = dccp_recv_post_select;
+	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);
 }