projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doxify acl.c.
[paraslash.git]
/
http_recv.c
diff --git
a/http_recv.c
b/http_recv.c
index 0a460adff4009428e8d457a30ff2426e4cc93deb..63b66d12610831ce06d362c4a533b9bc3a53e643 100644
(file)
--- a/
http_recv.c
+++ b/
http_recv.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-200
7
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-200
8
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-100,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;
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;
goto out;
+ }
t->ret = 1;
if (!s->select_ret)
goto out;
t->ret = 1;
if (!s->select_ret)
goto out;
@@
-136,13
+137,13
@@
static void http_recv_post_select(struct sched *s, struct task *t)
BUFSIZE - rn->loaded);
if (t->ret <= 0) {
if (!t->ret)
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)
goto out;
}
rn->loaded += t->ret;
out:
if (t->ret < 0)
- rn->e
of = 1
;
+ rn->e
rror = t->ret
;
}
static void http_recv_close(struct receiver_node *rn)
}
static void http_recv_close(struct receiver_node *rn)
@@
-166,37
+167,19
@@
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;
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 http_recv_args_info *conf = rn->conf;
- struct sockaddr_in their_addr;
- int ret;
+ int ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, 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)
if (ret < 0)
- goto err_out;
+ return ret;
+
+ rn->buf = para_calloc(BUFSIZE);
+ rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+
phd->fd = ret;
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);
- if (ret < 0) {
- close(phd->fd);
- goto err_out;
- }
mark_fd_nonblocking(phd->fd);
phd->status = HTTP_CONNECTED;
return 1;
mark_fd_nonblocking(phd->fd);
phd->status = HTTP_CONNECTED;
return 1;
-err_out:
- free(rn->private_data);
- free(rn->buf);
- return ret;
}
/**
}
/**