X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=796a7e6baf76fe15041386041e21d403b4c58cf0;hp=7b1f04efd29f6ffb2cbae4ffe05c3ac6f6c0cb65;hb=d1e6b28f66e243516d01916f9125baee75dd98d6;hpb=b333e042568b41c06672960534d9f0a092c0bb26

diff --git a/dccp_recv.c b/dccp_recv.c
index 7b1f04ef..796a7e6b 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,11 +113,10 @@ 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)
@@ -178,13 +183,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->post_select = NULL;
-	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);
 }