X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=03fca4e11bf519a0202e191b7df704c617fd570b;hp=80f0b1686496ce5fe4011d84e8a2d5e9e436264e;hb=a713c13d1089170828403e98c57d3fba9aedf9a4;hpb=9c00a79ed817c854ed10ee6bd1b908df8dc13a2f

diff --git a/http_recv.c b/http_recv.c
index 80f0b168..03fca4e1 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,12 @@
 /** \file http_recv.c paraslash's http receiver */
 
 #include <regex.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -57,7 +62,7 @@ static char *make_request_msg(void)
 
 static void http_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);
 	struct private_http_recv_data *phd = rn->private_data;
 
 	if (generic_recv_pre_select(s, t) <= 0)
@@ -75,7 +80,7 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
  */
 static int http_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 private_http_recv_data *phd = rn->private_data;
 	struct btr_node *btrn = rn->btrn;
 	int ret, iovcnt;
@@ -143,10 +148,8 @@ static void *http_recv_parse_config(int argc, char **argv)
 {
 	struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
-	if (!http_recv_cmdline_parser(argc, argv, tmp))
-		return tmp;
-	free(tmp);
-	return NULL;
+	http_recv_cmdline_parser(argc, argv, tmp);
+	return tmp;
 }
 
 static int http_recv_open(struct receiver_node *rn)
@@ -192,13 +195,9 @@ void http_recv_init(struct receiver *r)
 	r->open = http_recv_open;
 	r->close = http_recv_close;
 	r->pre_select = http_recv_pre_select;
-	r->post_select = NULL;
-	r->new_post_select = http_recv_post_select;
+	r->post_select = http_recv_post_select;
 	r->parse_config = http_recv_parse_config;
 	r->free_config = http_recv_free_config;
-	r->help = (struct ggo_help) {
-		.short_help = http_recv_args_info_help,
-		.detailed_help = http_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(http_recv);
 	http_recv_cmdline_parser_free(&dummy);
 }