/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
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;
if (!FD_ISSET(phd->fd, &s->wfds))
goto out;
rq = make_request_msg();
- PARA_INFO_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)
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");
+ PARA_INFO_LOG("received ok msg, streaming\n");
t->ret = 1;
phd->status = HTTP_STREAMING;
goto out;
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)
{
struct private_http_recv_data *phd;
struct http_recv_args_info *conf = rn->conf;
- int ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg, conf->port_arg);
+ int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
+ conf->port_arg);
if (ret < 0)
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 = ret;
- mark_fd_nonblocking(phd->fd);
+ phd->fd = fd;
phd->status = HTTP_CONNECTED;
return 1;
}