X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=1fb60bad810d86dbbb0098a3714c2caa3d9e835b;hp=2f334787200e4a0134df6a108a0c4dc8a7dd0775;hb=HEAD;hpb=e9b00a14a4653d767a9d0fe885aa0b6d56c42180 diff --git a/http_recv.c b/http_recv.c index 2f334787..8d2add19 100644 --- a/http_recv.c +++ b/http_recv.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 2005 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file http_recv.c paraslash's http receiver */ @@ -13,16 +9,16 @@ #include #include #include +#include +#include "recv_cmd.lsg.h" #include "para.h" #include "error.h" #include "http.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" @@ -30,7 +26,7 @@ /** * the possible states of a http receiver node * - * \sa receiver_node + * \sa \ref receiver_node. */ enum http_recv_status {HTTP_CONNECTED, HTTP_SENT_GET_REQUEST, HTTP_STREAMING}; @@ -46,7 +42,7 @@ struct private_http_recv_data { * It gets initialized to \p HTTP_CONNECTED by the open function of the * http receiver. * - * \sa receiver::open, receiver_node. + * \sa \ref receiver::open, \ref receiver_node. */ enum http_recv_status status; }; @@ -60,17 +56,17 @@ static char *make_request_msg(void) return ret; } -static void http_recv_pre_select(struct sched *s, void *context) +static void http_recv_pre_monitor(struct sched *s, void *context) { struct receiver_node *rn = context; struct private_http_recv_data *phd = rn->private_data; - if (generic_recv_pre_select(s, rn) <= 0) + if (generic_recv_pre_monitor(s, rn) <= 0) return; if (phd->status == HTTP_CONNECTED) - para_fd_set(rn->fd, &s->wfds, &s->max_fileno); + sched_monitor_writefd(rn->fd, s); else - para_fd_set(rn->fd, &s->rfds, &s->max_fileno); + sched_monitor_readfd(rn->fd, s); } /* @@ -78,7 +74,7 @@ static void http_recv_pre_select(struct sched *s, void *context) * 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) +static int http_recv_post_monitor(struct sched *s, void *context) { struct receiver_node *rn = context; struct private_http_recv_data *phd = rn->private_data; @@ -97,7 +93,7 @@ static int http_recv_post_select(struct sched *s, void *context) return 0; if (phd->status == HTTP_CONNECTED) { char *rq; - if (!FD_ISSET(rn->fd, &s->wfds)) + if (!sched_write_ok(rn->fd, s)) return 0; rq = make_request_msg(); PARA_INFO_LOG("sending http request\n"); @@ -109,9 +105,11 @@ static int http_recv_post_select(struct sched *s, void *context) return 0; } if (phd->status == HTTP_SENT_GET_REQUEST) { - ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds); - if (ret < 0) + ret = read_and_compare(rn->fd, HTTP_OK_MSG); + if (ret < 0) { + PARA_ERROR_LOG("did not receive HTTP OK message\n"); goto out; + } if (ret == 0) return 0; PARA_INFO_LOG("received ok msg, streaming\n"); @@ -122,7 +120,7 @@ static int http_recv_post_select(struct sched *s, void *context) iovcnt = btr_pool_get_buffers(rn->btrp, iov); if (iovcnt == 0) goto out; - ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes); + ret = readv_nonblock(rn->fd, iov, iovcnt, &num_bytes); if (num_bytes == 0) goto out; if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */ @@ -132,8 +130,10 @@ static int http_recv_post_select(struct sched *s, void *context) btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn); } out: - if (ret < 0) + if (ret < 0) { + PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); btr_remove_node(&rn->btrn); + } return ret; } @@ -144,20 +144,13 @@ static void http_recv_close(struct receiver_node *rn) free(rn->private_data); } -static void *http_recv_parse_config(int argc, char **argv) -{ - struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp)); - - http_recv_cmdline_parser(argc, argv, tmp); - return tmp; -} - static int http_recv_open(struct receiver_node *rn) { struct private_http_recv_data *phd; - struct http_recv_args_info *conf = rn->conf; - int fd, ret = para_connect_simple(IPPROTO_TCP, conf->host_arg, - conf->port_arg); + struct lls_parse_result *lpr = rn->lpr; + const char *r_i = RECV_CMD_OPT_STRING_VAL(HTTP, HOST, lpr); + uint32_t r_p = RECV_CMD_OPT_UINT32_VAL(HTTP, PORT, lpr); + int fd, ret = para_connect(IPPROTO_TCP, r_i, r_p); if (ret < 0) return ret; @@ -167,37 +160,16 @@ static int http_recv_open(struct receiver_node *rn) close(fd); return ret; } - rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data)); + rn->private_data = phd = zalloc(sizeof(struct private_http_recv_data)); rn->fd = fd; phd->status = HTTP_CONNECTED; rn->btrp = btr_pool_new("http_recv", 320 * 1024); return 1; } -static void http_recv_free_config(void *conf) -{ - http_recv_cmdline_parser_free(conf); - free(conf); -} - -/** - * The init function of the http receiver. - * - * \param r Pointer to the receiver struct to initialize. - * - * 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->parse_config = http_recv_parse_config; - r->free_config = http_recv_free_config; - r->help = (struct ggo_help)DEFINE_GGO_HELP(http_recv); - http_recv_cmdline_parser_free(&dummy); -} +const struct receiver lsg_recv_cmd_com_http_user_data = { + .open = http_recv_open, + .close = http_recv_close, + .pre_monitor = http_recv_pre_monitor, + .post_monitor = http_recv_post_monitor, +};