X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=71aef76ad3bcd49e6eccb9d1221addb4884bc96d;hp=56783b72a16379612973f61a288d18a93bb6fd45;hb=407702d2325663492958761b35400db3370ffdd0;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf diff --git a/http_recv.c b/http_recv.c index 56783b72..71aef76a 100644 --- a/http_recv.c +++ b/http_recv.c @@ -6,14 +6,16 @@ /** \file http_recv.c paraslash's http receiver */ -#include "para.h" +#include +#include +#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" @@ -175,17 +177,15 @@ static int http_recv_open(struct receiver_node *rn) ret = get_host_info(conf->host_arg, &he); if (ret < 0) goto err_out; - /* get new socket */ - ret = get_socket(); + ret = get_stream_socket(AF_INET); 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); + ret = PARA_CONNECT(phd->fd, &their_addr); if (ret < 0) { close(phd->fd); goto err_out;