Merge commit 'remotes/yangtse/master'

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 13c7fb57033d0a56dce0b685de741cb65dd88230..8c19d6d743c38c58398087029fddf1ddc7a1f348 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -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;
 
-       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;
@@ -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)
-                       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)
@@ -167,22 +168,18 @@ static int http_recv_open(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd;
        struct http_recv_args_info *conf = rn->conf;
-       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 = tcp_connect(conf->host_arg, conf->port_arg);
        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;
        mark_fd_nonblocking(phd->fd);
        phd->status = HTTP_CONNECTED;
        return 1;
-err_out:
-       free(rn->private_data);
-       free(rn->buf);
-       return ret;
 }
 
 /**