Merge commit 'remotes/fml/master'

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 05f452e6d02160ad33914ec96e0abbb48e696593..0a460adff4009428e8d457a30ff2426e4cc93deb 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -6,14 +6,16 @@
 
 /** \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"
@@ -181,15 +183,14 @@ static int http_recv_open(struct receiver_node *rn)
        phd->fd = ret;
        /* init their_addr */
        init_sockaddr(&their_addr, conf->port_arg, he);
-       /* connect */
        PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg,
                conf->port_arg);
-       ret = para_connect(phd->fd, &their_addr);
+       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: