Add btr support to the oggdec filter.

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index c418af129a0560fdb09e2aa2cf32e1c7b68146ed..cf93076d0c9bcea5705d624b980f6a8eda5a1f41 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,34 +1,27 @@
 /*
 /*

- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>

  *
  *

- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file http_recv.c paraslash's http receiver */
 
  */
 
 /** \file http_recv.c paraslash's http receiver */
 

-#include "para.h"
+#include <regex.h>
+#include <sys/types.h>
+#include <dirent.h>

 
 

+#include "para.h"
+#include "error.h"

 #include "http.h"
 #include "list.h"
 #include "sched.h"
 #include "http.h"
 #include "list.h"
 #include "sched.h"

+#include "ggo.h"

 #include "recv.h"
 #include "http_recv.cmdline.h"
 #include "recv.h"
 #include "http_recv.cmdline.h"

-#include "error.h"

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

+#include "buffer_tree.h"

 
 /** the output buffer size of the http receiver */
 #define BUFSIZE (32 * 1024)
 
 /** the output buffer size of the http receiver */
 #define BUFSIZE (32 * 1024)


@@ -51,7 +44,7 @@ struct private_http_recv_data {
  *
  * the current status of the http receiver node
  *
  *
  * the current status of the http receiver node
  *

- * It gets initialized to #HTTP_CONNECTED by the open function of the
+ * It gets initialized to \p HTTP_CONNECTED by the open function of the

  * http receiver.
  *
  * \sa receiver::open, receiver_node.
  * http receiver.
  *
  * \sa receiver::open, receiver_node.


@@ -69,11 +62,11 @@ struct private_http_recv_data {
  *
  * The post_select function of the http receiver uses \a fd, if ready, to
  * establish the http connection, and updates \a status according to the new
  *
  * The post_select function of the http receiver uses \a fd, if ready, to
  * establish the http connection, and updates \a status according to the new

- * state of the connection.  As soon as \a status is #HTTP_STREAMING, \a fd is
+ * state of the connection.  As soon as \a status is \p HTTP_STREAMING, \a fd is

  * going to be only checked for reading. If data is available, it is read into
  * the output buffer of the receiver node by post_select.
  *
  * going to be only checked for reading. If data is available, it is read into
  * the output buffer of the receiver node by post_select.
  *

- * \sa receiver::pre_select receiver::post_select receiver_node
+ * \sa receiver::pre_select receiver::post_select receiver_node, http_recv_status

  */
        int fd;
 };
  */
        int fd;
 };


@@ -94,70 +87,99 @@ static char *make_request_msg(void)
 
 static void http_recv_pre_select(struct sched *s, struct task *t)
 {
 
 static void http_recv_pre_select(struct sched *s, struct task *t)
 {

-       struct receiver_node *rn = t->private_data;
+       struct receiver_node *rn = container_of(t, struct receiver_node, task);

        struct private_http_recv_data *phd = rn->private_data;
 
        struct private_http_recv_data *phd = rn->private_data;
 

-       t->ret = 1;
+       t->error = 0;

        if  (phd->status == HTTP_CONNECTED)
                para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
        else
                para_fd_set(phd->fd, &s->rfds, &s->max_fileno);
 }
 
        if  (phd->status == HTTP_CONNECTED)
                para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
        else
                para_fd_set(phd->fd, &s->rfds, &s->max_fileno);
 }
 

+#define HTTP_RECV_MAX_PENDING (1024 * 1024)
+#define HTTP_RECV_READ_BUF_SIZE 4096

 
 static void http_recv_post_select(struct sched *s, struct task *t)
 {
 
 static void http_recv_post_select(struct sched *s, struct task *t)
 {

-       struct receiver_node *rn = t->private_data;
+       struct receiver_node *rn = container_of(t, struct receiver_node, task);

        struct private_http_recv_data *phd = rn->private_data;
        struct private_http_recv_data *phd = rn->private_data;

+       struct http_recv_args_info *conf = rn->conf;

 
 

-       t->ret = -E_HTTP_RECV_EOF;
-       if (rn->output_eof && *rn->output_eof)
-               goto out;
-       t->ret = 1;
-       if (!s->select_ret)
-               goto out;
-       if  (phd->status == HTTP_CONNECTED) {
+       if (rn->output_error && *rn->output_error < 0) {
+               t->error = *rn->output_error;
+               goto err;
+       }
+       if (phd->status == HTTP_CONNECTED) {

                char *rq;
                if (!FD_ISSET(phd->fd, &s->wfds))
                char *rq;
                if (!FD_ISSET(phd->fd, &s->wfds))

-                       goto out;
+                       return;

                rq = make_request_msg();
                rq = make_request_msg();

-               PARA_INFO_LOG("%s", "sending http request\n");
-               t->ret = send_va_buffer(phd->fd, "%s", rq);
+               PARA_INFO_LOG("sending http request\n");
+               t->error = send_va_buffer(phd->fd, "%s", rq);

                free(rq);
                free(rq);

-               if (t->ret > 0)
-                       phd->status = HTTP_SENT_GET_REQUEST;
-               goto out;
+               if (t->error < 0)
+                       goto err;
+               phd->status = HTTP_SENT_GET_REQUEST;
+               return;

        }
        if (!FD_ISSET(phd->fd, &s->rfds))
        }
        if (!FD_ISSET(phd->fd, &s->rfds))

-               goto out;
+               return;

        if (phd->status == HTTP_SENT_GET_REQUEST) {
        if (phd->status == HTTP_SENT_GET_REQUEST) {

-               t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
-               if (t->ret < 0)
-                       goto out;
-               PARA_INFO_LOG("%s", "received ok msg, streaming\n");
-               t->ret = 1;
+               t->error = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+               if (t->error < 0)
+                       goto err;
+               PARA_INFO_LOG("received ok msg, streaming\n");

                phd->status = HTTP_STREAMING;
                phd->status = HTTP_STREAMING;

-               goto out;
+               return;

        }
        }

-       t->ret = -E_OVERRUN;
+       if (conf->buffer_tree_given) {
+               char *buf;
+
+               if (btr_no_children(rn->btrn)) {
+                       t->error = -E_HTTP_RECV_NO_CHILD;
+                       goto err;
+               }
+               if (btr_bytes_pending(rn->btrn) > HTTP_RECV_MAX_PENDING) {
+                       t->error = -E_HTTP_RECV_OVERRUN;
+                       goto err;
+               }
+               buf = para_malloc(HTTP_RECV_READ_BUF_SIZE);
+               t->error = recv_bin_buffer(phd->fd, buf, HTTP_RECV_READ_BUF_SIZE);
+               if (t->error == 0)
+                       t->error = -E_RECV_EOF;
+               if (t->error < 0) {
+                       free(buf);
+                       goto err;
+               }
+               btr_add_output(buf, t->error, rn->btrn);
+               return;
+       }
+       t->error = -E_HTTP_RECV_OVERRUN;

        if (rn->loaded >= BUFSIZE)
        if (rn->loaded >= BUFSIZE)

-               goto out;
-       t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+               goto err;
+       t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,

                BUFSIZE - rn->loaded);
                BUFSIZE - rn->loaded);

-       if (t->ret <= 0) {
-               if (!t->ret)
-                       t->ret = -E_HTTP_RECV_EOF;
-               goto out;
+       if (t->error == 0)
+               t->error = -E_RECV_EOF;
+       if (t->error < 0)
+               goto err;
+       rn->loaded += t->error;
+       return;
+err:
+       if (conf->buffer_tree_given) {
+               btr_del_node(rn->btrn);
+               rn->btrn = NULL;

        }
        }

-       rn->loaded += t->ret;
-out:
-       if (t->ret < 0)
-               rn->eof = 1;

 }
 
 static void http_recv_close(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd = rn->private_data;
 }
 
 static void http_recv_close(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd = rn->private_data;

+       struct http_recv_args_info *conf = rn->conf;
+
+       if (conf->buffer_tree_given)
+               btr_del_node(rn->btrn);

        close(phd->fd);
        free(rn->buf);
        free(rn->private_data);
        close(phd->fd);
        free(rn->buf);
        free(rn->private_data);


@@ -176,39 +198,25 @@ static void *http_recv_parse_config(int argc, char **argv)
 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 hostent *he;

        struct http_recv_args_info *conf = rn->conf;
        struct http_recv_args_info *conf = rn->conf;

-       struct sockaddr_in their_addr;
-       int ret;
+       int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
+               conf->port_arg);

 
 

-       rn->buf = para_calloc(BUFSIZE);
-       rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
-       phd = rn->private_data;
-       ret = get_host_info(conf->host_arg, &he);
-       if (!ret < 0)
-               goto err_out;
-       /* get new socket */
-       ret = get_socket();

        if (ret < 0)
        if (ret < 0)

-               goto err_out;
-       phd->fd = ret;
-       /* init their_addr */
-       init_sockaddr(&their_addr, conf->port_arg, he);
-       /* connect */
-       PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg,
-               conf->port_arg);
-       ret = para_connect(phd->fd, &their_addr);
+               return ret;
+       fd = ret;
+       ret = mark_fd_nonblocking(fd);

        if (ret < 0) {
        if (ret < 0) {

-               close(phd->fd);
-               goto err_out;
+               close(fd);
+               return ret;

        }
        }

-       mark_fd_nonblock(phd->fd);
+       rn->buf = para_calloc(BUFSIZE);
+       rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+       phd->fd = fd;

        phd->status = HTTP_CONNECTED;
        phd->status = HTTP_CONNECTED;

+       if (conf->buffer_tree_given)
+               rn->btrn = btr_new_node("receiver", NULL, NULL, NULL);

        return 1;
        return 1;

-err_out:
-       free(rn->private_data);
-       free(rn->buf);
-       return ret;

 }
 
 /**
 }
 
 /**


@@ -220,10 +228,18 @@ err_out:
  */
 void http_recv_init(struct receiver *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->shutdown = http_shutdown;
        r->parse_config = http_recv_parse_config;
        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->shutdown = http_shutdown;
        r->parse_config = http_recv_parse_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);

 }
 }