X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=http_recv.c;h=4283db4ba847dcd9a75025424bd48af36f1c799f;hb=d2e164526bed7f523043b7e4ec5bd282d5bc6f19;hp=13c7fb57033d0a56dce0b685de741cb65dd88230;hpb=e1890028c21d233087266fd7997d68a88cb9afce;p=paraslash.git diff --git a/http_recv.c b/http_recv.c index 13c7fb57..4283db4b 100644 --- a/http_recv.c +++ b/http_recv.c @@ -167,22 +167,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; } /**