X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=2f334787200e4a0134df6a108a0c4dc8a7dd0775;hp=ad8e213c6f25372c70597286ec959a1dccf63eba;hb=5ff80e887a99a192bab3339c4339f8202733f031;hpb=74c88020bd325865fe26ed25ea8ad0ace0924136

diff --git a/http_recv.c b/http_recv.c
index ad8e213c..2f334787 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 Andre Noll <maan@tuebingen.mpg.de>
  *
  * 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"
@@ -55,12 +60,12 @@ static char *make_request_msg(void)
 	return ret;
 }
 
-static void http_recv_pre_select(struct sched *s, struct task *t)
+static void http_recv_pre_select(struct sched *s, void *context)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = context;
 	struct private_http_recv_data *phd = rn->private_data;
 
-	if (generic_recv_pre_select(s, t) <= 0)
+	if (generic_recv_pre_select(s, rn) <= 0)
 		return;
 	if  (phd->status == HTTP_CONNECTED)
 		para_fd_set(rn->fd, &s->wfds, &s->max_fileno);
@@ -73,16 +78,16 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
  * area with data read from the socket. In any case, update the state of the
  * connection if necessary.
  */
-static int http_recv_post_select(struct sched *s, struct task *t)
+static int http_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 private_http_recv_data *phd = rn->private_data;
 	struct btr_node *btrn = rn->btrn;
 	int ret, iovcnt;
 	struct iovec iov[2];
 	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);
@@ -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,12 +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->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);
 }