02_Reverse-lookup-support.diff

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 05f452e6d02160ad33914ec96e0abbb48e696593..13c7fb57033d0a56dce0b685de741cb65dd88230 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -6,14 +6,16 @@
 
 /** \file http_recv.c paraslash's http receiver */
 
 
 /** \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 "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"
 #include "net.h"
 #include "string.h"
 #include "fd.h"


@@ -164,32 +166,17 @@ 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;
 
        rn->buf = para_calloc(BUFSIZE);
        rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
        phd = rn->private_data;
        int ret;
 
        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);
+       ret = tcp_connect(conf->host_arg, conf->port_arg);

        if (ret < 0)
                goto err_out;
        phd->fd = ret;
        if (ret < 0)
                goto err_out;
        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);
-       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:
        phd->status = HTTP_CONNECTED;
        return 1;
 err_out: