Merge branch 'refs/heads/t/portable_io'

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 80f0b1686496ce5fe4011d84e8a2d5e9e436264e..67691a34f121db02365a884ef1fd4e63cc63d918 100644 (file)
--- 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.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -7,17 +7,22 @@
 /** \file http_recv.c paraslash's http receiver */
 
 #include <regex.h>
 /** \file http_recv.c paraslash's http receiver */
 
 #include <regex.h>

+#include <netinet/in.h>
+#include <sys/socket.h>

 #include <sys/types.h>
 #include <sys/types.h>

+#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 "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 "buffer_tree.h"
 #include "recv.h"

-#include "http_recv.cmdline.h"

 #include "net.h"
 #include "string.h"
 #include "fd.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"


@@ -25,7 +30,7 @@
 /**
  * the possible states of a http receiver node
  *
 /**
  * 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};
 
  */
 enum http_recv_status {HTTP_CONNECTED, HTTP_SENT_GET_REQUEST, HTTP_STREAMING};
 


@@ -41,7 +46,7 @@ struct private_http_recv_data {
         * It gets initialized to \p HTTP_CONNECTED by the open function of the
         * http receiver.
         *
         * 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;
 };
         */
        enum http_recv_status status;
 };


@@ -55,12 +60,12 @@ static char *make_request_msg(void)
        return ret;
 }
 
        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;
 
        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);
                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.
  */
  * 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;
 
        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);
        if (ret < 0)
                goto out;
        ret = btr_node_status(btrn, 0, BTR_NT_ROOT);


@@ -139,22 +144,13 @@ static void http_recv_close(struct receiver_node *rn)
        free(rn->private_data);
 }
 
        free(rn->private_data);
 }
 

-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;
-}
-

 static int http_recv_open(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd;
 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;
 
        if (ret < 0)
                return ret;


@@ -171,34 +167,10 @@ static int http_recv_open(struct receiver_node *rn)
        return 1;
 }
 
        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 = NULL;
-       r->new_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
-       };
-       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,
+};