recv improvements.

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index c7eb485a7797f282917c8c4d4b4d34889cba603b..0b83cb4424654df83bb88eda953e158a966eeee7 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file http_recv.c paraslash's http receiver */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -14,11 +15,13 @@
 #include "http.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "http_recv.cmdline.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)
@@ -94,58 +97,90 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
                para_fd_set(phd->fd, &s->rfds, &s->max_fileno);
 }
 
+#define HTTP_RECV_READ_BUF_SIZE 4096
 
 static void http_recv_post_select(struct sched *s, struct task *t)
 {
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_http_recv_data *phd = rn->private_data;
+       struct btr_node *btrn = rn->btrn;
+       int ret;
 
-       if (rn->output_error && *rn->output_error < 0) {
-               t->error = *rn->output_error;
-               return;
+       t->error = 0;
+       if (btrn) {
+               ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
+               if (ret < 0)
+                       goto err;
+               if (ret == 0)
+                       return;
+       } else {
+               if (rn->output_error && *rn->output_error < 0) {
+                       ret = *rn->output_error;
+                       goto err;
+               }
        }
-       if  (phd->status == HTTP_CONNECTED) {
+       if (phd->status == HTTP_CONNECTED) {
                char *rq;
                if (!FD_ISSET(phd->fd, &s->wfds))
                        return;
                rq = make_request_msg();
                PARA_INFO_LOG("sending http request\n");
-               t->error = send_va_buffer(phd->fd, "%s", rq);
+               ret = send_va_buffer(phd->fd, "%s", rq);
                free(rq);
-               if (t->error >= 0)
-                       phd->status = HTTP_SENT_GET_REQUEST;
+               if (ret < 0)
+                       goto err;
+               phd->status = HTTP_SENT_GET_REQUEST;
                return;
        }
        if (!FD_ISSET(phd->fd, &s->rfds))
                return;
        if (phd->status == HTTP_SENT_GET_REQUEST) {
-               t->error = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
-               if (t->error >= 0) {
-                       PARA_INFO_LOG("received ok msg, streaming\n");
-                       phd->status = HTTP_STREAMING;
-               }
+               ret = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+               if (ret < 0)
+                       goto err;
+               PARA_INFO_LOG("received ok msg, streaming\n");
+               phd->status = HTTP_STREAMING;
                return;
        }
-       if (rn->loaded >= BUFSIZE) {
-               t->error = -E_HTTP_RECV_OVERRUN;
+       if (btrn) {
+               char *buf;
+
+               buf = para_malloc(HTTP_RECV_READ_BUF_SIZE);
+               ret = recv_bin_buffer(phd->fd, buf, HTTP_RECV_READ_BUF_SIZE);
+               if (ret == 0)
+                       ret = -E_RECV_EOF;
+               if (ret < 0) {
+                       free(buf);
+                       goto err;
+               }
+               btr_add_output(buf, ret, btrn);
                return;
        }
-       t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+       ret = -E_HTTP_RECV_OVERRUN;
+       if (rn->loaded >= BUFSIZE)
+               goto err;
+       ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
                BUFSIZE - rn->loaded);
-       if (t->error > 0) {
-               rn->loaded += t->error;
-               return;
-       }
-       if (!t->error)
-               t->error = -E_RECV_EOF;
+       if (ret == 0)
+               ret = -E_RECV_EOF;
+       if (ret < 0)
+               goto err;
+       rn->loaded += ret;
+       return;
+err:
+       if (btrn)
+               btr_remove_node(rn->btrn);
+       t->error = ret;
 }
 
 static void http_recv_close(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd = rn->private_data;
+
        close(phd->fd);
        free(rn->buf);
        free(rn->private_data);
+       http_recv_cmdline_parser_free(rn->conf);
 }
 
 static void *http_recv_parse_config(int argc, char **argv)
@@ -189,10 +224,18 @@ static int http_recv_open(struct receiver_node *rn)
  */
 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->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);
 }