recv improvements.

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 59f00d831c6bf3f03747a808599b929a66e7edc3..0b83cb4424654df83bb88eda953e158a966eeee7 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -97,18 +97,27 @@ 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_MAX_PENDING (1024 * 1024)
 #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 http_recv_args_info *conf = rn->conf;
+       struct btr_node *btrn = rn->btrn;
+       int ret;
 
-       if (rn->output_error && *rn->output_error < 0) {
-               t->error = *rn->output_error;
-               goto err;
+       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) {
                char *rq;
@@ -116,9 +125,9 @@ static void http_recv_post_select(struct sched *s, struct task *t)
                        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)
+               if (ret < 0)
                        goto err;
                phd->status = HTTP_SENT_GET_REQUEST;
                return;
@@ -126,63 +135,52 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        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)
+               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 (conf->buffer_tree_given) {
+       if (btrn) {
                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) {
+               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, t->error, rn->btrn);
+               btr_add_output(buf, ret, btrn);
                return;
        }
-       t->error = -E_HTTP_RECV_OVERRUN;
+       ret = -E_HTTP_RECV_OVERRUN;
        if (rn->loaded >= BUFSIZE)
                goto err;
-       t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+       ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
                BUFSIZE - rn->loaded);
-       if (t->error == 0)
-               t->error = -E_RECV_EOF;
-       if (t->error < 0)
+       if (ret == 0)
+               ret = -E_RECV_EOF;
+       if (ret < 0)
                goto err;
-       rn->loaded += t->error;
+       rn->loaded += ret;
        return;
 err:
-       if (conf->buffer_tree_given) {
-               btr_del_node(rn->btrn);
-               rn->btrn = NULL;
-       }
+       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;
-       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);
+       http_recv_cmdline_parser_free(rn->conf);
 }
 
 static void *http_recv_parse_config(int argc, char **argv)
@@ -214,8 +212,6 @@ static int http_recv_open(struct receiver_node *rn)
        rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
        phd->fd = fd;
        phd->status = HTTP_CONNECTED;
-       if (conf->buffer_tree_given)
-               rn->btrn = btr_new_node("receiver", NULL, NULL);
        return 1;
 }