/*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file http_recv.c paraslash's http receiver */
#include <regex.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
#include <sys/types.h>
-#include <dirent.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
#include "para.h"
#include "error.h"
#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
* \sa receiver::open, receiver_node.
*/
enum http_recv_status status;
- /**
- * The file descriptor used for receiving the http stream.
- *
- * The pre_select function of the http receiver adds this file descriptor to
- * the set of file decriptors which are checked for reading/writing (depending
- * on the current status) by the select loop of the application (para_audiod or
- * para_recv).
- *
- * 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 \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.
- *
- * \sa receiver::pre_select receiver::post_select receiver_node, http_recv_status
- */
- int fd;
- struct btr_pool *btrp;
};
static char *make_request_msg(void)
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;
- t->error = 0;
- 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(phd->fd, &s->wfds, &s->max_fileno);
+ para_fd_set(rn->fd, &s->wfds, &s->max_fileno);
else
- para_fd_set(phd->fd, &s->rfds, &s->max_fileno);
+ para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
}
-static void http_recv_post_select(struct sched *s, struct task *t)
+/*
+ * Establish the http connection. If already established, fill the buffer pool
+ * 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, 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;
- char *buf;
- size_t sz, n;
+ int ret, iovcnt;
+ struct iovec iov[2];
+ size_t num_bytes;
- t->error = 0;
+ ret = task_get_notification(rn->task);
+ 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;
+ return 0;
if (phd->status == HTTP_CONNECTED) {
char *rq;
- if (!FD_ISSET(phd->fd, &s->wfds))
- return;
+ if (!FD_ISSET(rn->fd, &s->wfds))
+ return 0;
rq = make_request_msg();
PARA_INFO_LOG("sending http request\n");
- ret = send_va_buffer(phd->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;
+ return 0;
}
if (phd->status == HTTP_SENT_GET_REQUEST) {
- ret = read_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
+ 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;
+ return 0;
PARA_INFO_LOG("received ok msg, streaming\n");
phd->status = HTTP_STREAMING;
- return;
+ return 0;
}
ret = -E_HTTP_RECV_OVERRUN;
- sz = btr_pool_get_buffer(phd->btrp, &buf);
- if (sz == 0)
- goto err;
- ret = read_nonblock(phd->fd, buf, sz, &s->rfds, &n);
- if (n > 0)
- btr_add_output_pool(phd->btrp, n, btrn);
- if (ret >= 0)
- return;
-err:
- btr_remove_node(rn->btrn);
- t->error = ret;
+ 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)
+ btr_remove_node(&rn->btrn);
+ return ret;
}
static void http_recv_close(struct receiver_node *rn)
{
- struct private_http_recv_data *phd = rn->private_data;
-
- close(phd->fd);
- btr_pool_free(phd->btrp);
+ close(rn->fd);
+ btr_pool_free(rn->btrp);
free(rn->private_data);
}
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;
- free(tmp);
- return NULL;
+ http_recv_cmdline_parser(argc, argv, tmp);
+ return tmp;
}
static int http_recv_open(struct receiver_node *rn)
return ret;
}
rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
- phd->fd = fd;
+ rn->fd = fd;
phd->status = HTTP_CONNECTED;
- phd->btrp = btr_pool_new("http_recv", 320 * 1024);
+ rn->btrp = btr_pool_new("http_recv", 320 * 1024);
return 1;
}
r->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
- };
+ r->help = (struct ggo_help)DEFINE_GGO_HELP(http_recv);
http_recv_cmdline_parser_free(&dummy);
}
projects / paraslash.git / blobdiff