Cosmetics.

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index f82924d9cfd728c83f4bed516fc4e84dbe21e139..8c19d6d743c38c58398087029fddf1ddc7a1f348 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -6,6 +6,9 @@
 
 /** \file http_recv.c paraslash's http receiver */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "error.h"
 #include "http.h"
@@ -97,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;
@@ -133,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)
@@ -163,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;
-       struct hostent *he;
        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)
-               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;
-       /* 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_nonblock(phd->fd);
+       mark_fd_nonblocking(phd->fd);
        phd->status = HTTP_CONNECTED;
        return 1;
-err_out:
-       free(rn->private_data);
-       free(rn->buf);
-       return ret;
 }
 
 /**