X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=a3167bd8626f8bc40361bfb71369079db955d9cc;hp=3d72c7c7396ca3b8f96f63653aec9c021cb90846;hb=6d5a56308a3a833b08ae0e3692b794fb6122ea60;hpb=d041f4528426640d73d141cec7fd2576f7e8be84 diff --git a/http_recv.c b/http_recv.c index 3d72c7c7..a3167bd8 100644 --- a/http_recv.c +++ b/http_recv.c @@ -1,31 +1,21 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2008 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file http_recv.c paraslash's http receiver */ -#include "para.h" +#include +#include +#include "para.h" +#include "error.h" #include "http.h" #include "list.h" #include "sched.h" #include "recv.h" #include "http_recv.cmdline.h" -#include "error.h" #include "net.h" #include "string.h" #include "fd.h" @@ -51,7 +41,7 @@ struct private_http_recv_data { * * the current status of the http receiver node * - * It gets initialized to #HTTP_CONNECTED by the open function of the + * It gets initialized to \p HTTP_CONNECTED by the open function of the * http receiver. * * \sa receiver::open, receiver_node. @@ -69,11 +59,11 @@ struct private_http_recv_data { * * 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 #HTTP_STREAMING, \a fd is + * 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 + * \sa receiver::pre_select receiver::post_select receiver_node, http_recv_status */ int fd; }; @@ -87,7 +77,7 @@ static char *make_request_msg(void) { char *ret, *hn = para_hostname(); ret = make_message("%s1.0\nHost: %s\nUser-Agent: para_recv/%s\n\n\n", - HTTP_GET_MSG, hn, VERSION); + HTTP_GET_MSG, hn, PACKAGE_VERSION); free(hn); return ret; } @@ -110,9 +100,10 @@ static void http_recv_post_select(struct sched *s, struct task *t) struct receiver_node *rn = t->private_data; struct private_http_recv_data *phd = rn->private_data; - t->ret = -E_HTTP_RECV_EOF; - if (rn->output_eof && *rn->output_eof) + if (rn->output_error && *rn->output_error) { + t->ret = *rn->output_error; goto out; + } t->ret = 1; if (!s->select_ret) goto out; @@ -121,7 +112,7 @@ static void http_recv_post_select(struct sched *s, struct task *t) if (!FD_ISSET(phd->fd, &s->wfds)) goto out; rq = make_request_msg(); - PARA_NOTICE_LOG("%s", "sending http request\n"); + PARA_INFO_LOG("sending http request\n"); t->ret = send_va_buffer(phd->fd, "%s", rq); free(rq); if (t->ret > 0) @@ -134,25 +125,25 @@ static void http_recv_post_select(struct sched *s, struct task *t) t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE); if (t->ret < 0) goto out; - PARA_NOTICE_LOG("%s", "received ok msg, streaming\n"); + PARA_INFO_LOG("received ok msg, streaming\n"); t->ret = 1; phd->status = HTTP_STREAMING; goto out; } - t->ret = -E_OVERRUN; + 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; + t->ret = -E_RECV_EOF; goto out; } rn->loaded += t->ret; out: if (t->ret < 0) - rn->eof = 1; + rn->error = t->ret; } static void http_recv_close(struct receiver_node *rn) @@ -176,36 +167,23 @@ 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; - - rn->buf = para_calloc(BUFSIZE); - rn->private_data = para_calloc(sizeof(struct private_http_recv_data)); - phd = rn->private_data; - PARA_NOTICE_LOG("phd = %p, rn = %p\n", phd, rn); - ret = get_host_info(conf->host_arg, &he); - if (!ret < 0) - goto err_out; - /* get new socket */ - ret = -E_SOCKET; - if ((phd->fd = get_socket()) < 0) - goto err_out; - /* init their_addr */ - init_sockaddr(&their_addr, conf->port_arg, he); - /* connect */ - PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, + int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg, conf->port_arg); - ret = para_connect(phd->fd, &their_addr); + if (ret < 0) - goto err_out; + return ret; + fd = ret; + ret = mark_fd_nonblocking(fd); + if (ret < 0) { + close(fd); + return ret; + } + rn->buf = para_calloc(BUFSIZE); + rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data)); + phd->fd = fd; phd->status = HTTP_CONNECTED; return 1; -err_out: - free(rn->private_data); - free(rn->buf); - return ret; } /**