/*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
- * 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 <sys/types.h>
+#include <dirent.h>
+#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"
*
* 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.
*
* 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;
};
{
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;
}
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) {
- rn->eof = 1;
- return;
+ if (rn->output_error && *rn->output_error) {
+ t->ret = *rn->output_error;
+ goto out;
}
t->ret = 1;
- if (!s->select_ret) /* we're not interested in timeouts */
- return;
+ if (!s->select_ret)
+ goto out;
if (phd->status == HTTP_CONNECTED) {
char *rq;
if (!FD_ISSET(phd->fd, &s->wfds))
- return; /* nothing to do */
+ goto out;
rq = make_request_msg();
- PARA_NOTICE_LOG("%s", "sending http request\n");
+ PARA_INFO_LOG("%s", "sending http request\n");
t->ret = send_va_buffer(phd->fd, "%s", rq);
free(rq);
if (t->ret > 0)
phd->status = HTTP_SENT_GET_REQUEST;
- return;
+ goto out;
}
if (!FD_ISSET(phd->fd, &s->rfds))
- return; /* nothing to do */
+ goto out;
if (phd->status == HTTP_SENT_GET_REQUEST) {
t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
if (t->ret < 0)
- return;
- PARA_NOTICE_LOG("%s", "received ok msg, streaming\n");
+ goto out;
+ PARA_INFO_LOG("%s", "received ok msg, streaming\n");
+ t->ret = 1;
phd->status = HTTP_STREAMING;
- return;
- }
- t->ret = -E_OVERRUN;
- /* already streaming */
- if (rn->loaded >= BUFSIZE) {
- rn->eof = 1;
- return;
+ goto out;
}
+ 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) {
- rn->eof = 1;
if (!t->ret)
- t->ret = -E_HTTP_RECV_EOF;
- return;
+ t->ret = -E_RECV_EOF;
+ goto out;
}
rn->loaded += t->ret;
+out:
+ if (t->ret < 0)
+ rn->error = t->ret;
}
static void http_recv_close(struct receiver_node *rn)
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 = -E_HOST_INFO;
- if (!(he = get_host_info(conf->host_arg)))
- 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;
}
/**