/*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#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"
-#include "buffer_tree.h"
/**
* the possible states of a http receiver node
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;
- char *buf;
- size_t sz, n;
+ int ret, iovcnt;
+ struct iovec iov[2];
+ size_t num_bytes;
- t->error = 0;
+ ret = task_get_notification(t);
+ if (ret < 0)
+ goto out;
ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
if (ret < 0)
- goto err;
+ goto out;
if (ret == 0)
return;
if (phd->status == HTTP_CONNECTED) {
return;
rq = make_request_msg();
PARA_INFO_LOG("sending http request\n");
- ret = send_va_buffer(rn->fd, "%s", rq);
+ ret = write_va_buffer(rn->fd, "%s", rq);
free(rq);
if (ret < 0)
- goto err;
+ goto out;
phd->status = HTTP_SENT_GET_REQUEST;
return;
}
if (phd->status == HTTP_SENT_GET_REQUEST) {
ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
if (ret < 0)
- goto err;
+ goto out;
if (ret == 0)
return;
PARA_INFO_LOG("received ok msg, streaming\n");
return;
}
ret = -E_HTTP_RECV_OVERRUN;
- sz = btr_pool_get_buffer(rn->btrp, &buf);
- if (sz == 0)
- goto err;
- ret = read_nonblock(rn->fd, buf, sz, &s->rfds, &n);
- if (n > 0)
- btr_add_output_pool(rn->btrp, n, btrn);
+ iovcnt = btr_pool_get_buffers(rn->btrp, iov);
+ if (iovcnt == 0)
+ goto out;
+ ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes);
+ if (num_bytes == 0)
+ goto out;
+ if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */
+ btr_add_output_pool(rn->btrp, num_bytes, btrn);
+ else { /* both buffers contain data */
+ btr_add_output_pool(rn->btrp, iov[0].iov_len, btrn);
+ btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn);
+ }
+out:
if (ret >= 0)
return;
-err:
- btr_remove_node(rn->btrn);
+ btr_remove_node(&rn->btrn);
t->error = ret;
}
static void *http_recv_parse_config(int argc, char **argv)
{
- struct http_recv_args_info *tmp = para_calloc(sizeof(struct http_recv_args_info));
+ struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp));
if (!http_recv_cmdline_parser(argc, argv, tmp))
return tmp;