X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=636e224158a965ab68c0685c93411fe4767ea991;hp=71aef76ad3bcd49e6eccb9d1221addb4884bc96d;hb=f8a941c97b6d0a891d0e075c4996d033a7db63bf;hpb=3689799ede7bba230ca544ac953392b428c3d662 diff --git a/http_recv.c b/http_recv.c index 71aef76a..636e2241 100644 --- a/http_recv.c +++ b/http_recv.c @@ -1,11 +1,12 @@ /* - * Copyright (C) 2005-2007 Andre Noll + * Copyright (C) 2005-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file http_recv.c paraslash's http receiver */ +#include #include #include @@ -14,14 +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" - -/** the output buffer size of the http receiver */ -#define BUFSIZE (32 * 1024) +#include "buffer_tree.h" /** * the possible states of a http receiver node @@ -31,48 +31,40 @@ enum http_recv_status {HTTP_CONNECTED, HTTP_SENT_GET_REQUEST, HTTP_STREAMING}; /** - * data specific to the http receiver + * Data specific to the http receiver. * * Each running instance of the http receiver reserves space for one such struct. */ struct private_http_recv_data { -/** - * - * - * the current status of the http receiver node - * - * It gets initialized to \p HTTP_CONNECTED by the open function of the - * http receiver. - * - * \sa receiver::open, receiver_node. - */ + /** + * The current status of the http receiver node. + * + * It gets initialized to \p HTTP_CONNECTED by the open function of the + * http receiver. + * + * \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 - */ + /** + * 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 void http_shutdown(void) -{ - return; -} - static char *make_request_msg(void) { char *ret, *hn = para_hostname(); @@ -84,72 +76,78 @@ static char *make_request_msg(void) 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; - t->ret = 1; + t->error = 0; + if (generic_recv_pre_select(s, t) <= 0) + return; 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); } - 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 btr_node *btrn = rn->btrn; + int ret; + char *buf; + size_t sz; - 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) { + t->error = 0; + ret = btr_node_status(btrn, 0, BTR_NT_ROOT); + if (ret < 0) + goto err; + if (ret == 0) + return; + if (phd->status == HTTP_CONNECTED) { char *rq; if (!FD_ISSET(phd->fd, &s->wfds)) - goto out; + return; 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"); + ret = send_va_buffer(phd->fd, "%s", rq); free(rq); - if (t->ret > 0) - phd->status = HTTP_SENT_GET_REQUEST; - goto out; + if (ret < 0) + goto err; + phd->status = HTTP_SENT_GET_REQUEST; + return; } - if (!FD_ISSET(phd->fd, &s->rfds)) - goto out; 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; + ret = read_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds); + if (ret < 0) + goto err; + if (ret == 0) + return; + PARA_INFO_LOG("received ok msg, streaming\n"); phd->status = HTTP_STREAMING; - goto out; + return; } - t->ret = -E_HTTP_RECV_OVERRUN; - if (rn->loaded >= BUFSIZE) - goto out; - t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded, - BUFSIZE - rn->loaded); - if (t->ret <= 0) { - if (!t->ret) - t->ret = -E_HTTP_RECV_EOF; - goto out; - } - rn->loaded += t->ret; -out: - if (t->ret < 0) - rn->eof = 1; + ret = -E_HTTP_RECV_OVERRUN; + sz = btr_pool_get_buffer(phd->btrp, &buf); + if (sz == 0) + goto err; + ret = recv_bin_buffer(phd->fd, buf, sz); + if (ret == 0) + ret = -E_RECV_EOF; + if (ret < 0) + goto err; + btr_add_output_pool(phd->btrp, ret, btrn); + return; +err: + 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); + btr_pool_free(phd->btrp); free(rn->private_data); } @@ -166,52 +164,52 @@ 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; - struct hostent *he; struct http_recv_args_info *conf = rn->conf; - struct sockaddr_in their_addr; - int ret; + int fd, ret = para_connect_simple(IPPROTO_TCP, 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; - ret = get_stream_socket(AF_INET); if (ret < 0) - goto err_out; - phd->fd = ret; - /* init their_addr */ - init_sockaddr(&their_addr, conf->port_arg, he); - 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) { - close(phd->fd); - goto err_out; + close(fd); + return ret; } - mark_fd_nonblock(phd->fd); + rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data)); + phd->fd = fd; phd->status = HTTP_CONNECTED; + phd->btrp = btr_pool_new("http_recv", 320 * 1024); return 1; -err_out: - free(rn->private_data); - free(rn->buf); - return ret; +} + +static void http_recv_free_config(void *conf) +{ + http_recv_cmdline_parser_free(conf); + free(conf); } /** - * the init function of the http receiver + * The init function of the http receiver. * - * \param r pointer to the receiver struct to initialize + * \param r Pointer to the receiver struct to initialize. * - * Just initialize all function pointers of \a r. + * This initializes all function pointers of \a 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->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 + }; + http_recv_cmdline_parser_free(&dummy); }