X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=3a723299e78b241a9ac4f44a13caf91651f36b6a;hp=9deea791a598a42d4a3567885f3b0beb4bb8fcc7;hb=9d232e636d79a2321e280fe3eee6839c8f45c36f;hpb=c1b282afb8e8422d12ae01a77937f27281748f1b

diff --git a/http_recv.c b/http_recv.c
index 9deea791..3a723299 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file http_recv.c paraslash's http receiver */
 
@@ -13,16 +9,16 @@
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <lopsub.h>
 
+#include "recv_cmd.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "http.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "recv.h"
-#include "http_recv.cmdline.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"
@@ -30,7 +26,7 @@
 /**
  * the possible states of a http receiver node
  *
- * \sa receiver_node
+ * \sa \ref receiver_node.
  */
 enum http_recv_status {HTTP_CONNECTED, HTTP_SENT_GET_REQUEST, HTTP_STREAMING};
 
@@ -46,7 +42,7 @@ struct private_http_recv_data {
 	 * It gets initialized to \p HTTP_CONNECTED by the open function of the
 	 * http receiver.
 	 *
-	 * \sa receiver::open, receiver_node.
+	 * \sa \ref receiver::open, \ref receiver_node.
 	 */
 	enum http_recv_status status;
 };
@@ -110,8 +106,10 @@ static int http_recv_post_select(struct sched *s, void *context)
 	}
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
 		ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
-		if (ret < 0)
+		if (ret < 0) {
+			PARA_ERROR_LOG("did not receive HTTP OK message\n");
 			goto out;
+		}
 		if (ret == 0)
 			return 0;
 		PARA_INFO_LOG("received ok msg, streaming\n");
@@ -132,8 +130,10 @@ static int http_recv_post_select(struct sched *s, void *context)
 		btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn);
 	}
 out:
-	if (ret < 0)
+	if (ret < 0) {
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 		btr_remove_node(&rn->btrn);
+	}
 	return ret;
 }
 
@@ -144,20 +144,13 @@ static void http_recv_close(struct receiver_node *rn)
 	free(rn->private_data);
 }
 
-static void *http_recv_parse_config(int argc, char **argv)
-{
-	struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp));
-
-	http_recv_cmdline_parser(argc, argv, tmp);
-	return tmp;
-}
-
 static int http_recv_open(struct receiver_node *rn)
 {
 	struct private_http_recv_data *phd;
-	struct http_recv_args_info *conf = rn->conf;
-	int fd, ret = para_connect_simple(IPPROTO_TCP, conf->host_arg,
-						       conf->port_arg);
+	struct lls_parse_result *lpr = rn->lpr;
+	const char *r_i = RECV_CMD_OPT_STRING_VAL(HTTP, HOST, lpr);
+	uint32_t r_p = RECV_CMD_OPT_UINT32_VAL(HTTP, PORT, lpr);
+	int fd, ret = para_connect_simple(IPPROTO_TCP, r_i, r_p);
 
 	if (ret < 0)
 		return ret;
@@ -174,30 +167,10 @@ static int http_recv_open(struct receiver_node *rn)
 	return 1;
 }
 
-static void http_recv_free_config(void *conf)
-{
-	http_recv_cmdline_parser_free(conf);
-	free(conf);
-}
-
-/**
- * The init function of the http receiver.
- *
- * \param r Pointer to the receiver struct to initialize.
- *
- * This initializes all function pointers of \a r.
- */
-void http_recv_init(struct receiver *r)
-{
-	struct http_recv_args_info dummy;
-
-	http_recv_cmdline_parser_init(&dummy);
-	r->open = http_recv_open;
-	r->close = http_recv_close;
-	r->pre_select = http_recv_pre_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)DEFINE_GGO_HELP(http_recv);
-	http_recv_cmdline_parser_free(&dummy);
-}
+/** See \ref recv_init(). */
+const struct receiver lsg_recv_cmd_com_http_user_data = {
+	.open = http_recv_open,
+	.close = http_recv_close,
+	.pre_select = http_recv_pre_select,
+	.post_select = http_recv_post_select,
+};