X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=cc376dd9a6e0c07c1dfe9f368aebdd1fbaf98c85;hp=cdb4bc151c4f580803160b80af672cc9d011bfa7;hb=7cb8fa26cfdcb3d34f8be2b86c48ffc6d7b9d84a;hpb=62342ef50476f58e97cd9bb160fdb74ec4989bff diff --git a/http_recv.c b/http_recv.c index cdb4bc15..cc376dd9 100644 --- a/http_recv.c +++ b/http_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -23,9 +23,6 @@ #include "fd.h" #include "buffer_tree.h" -/** the output buffer size of the http receiver */ -#define BUFSIZE (32 * 1024) - /** * the possible states of a http receiver node * @@ -151,7 +148,6 @@ static void http_recv_close(struct receiver_node *rn) close(phd->fd); btr_pool_free(phd->btrp); - free(rn->buf); free(rn->private_data); } @@ -169,8 +165,8 @@ static int http_recv_open(struct receiver_node *rn) { struct private_http_recv_data *phd; struct http_recv_args_info *conf = rn->conf; - int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg, - conf->port_arg); + int fd, ret = para_connect_simple(IPPROTO_TCP, conf->host_arg, + conf->port_arg); if (ret < 0) return ret; @@ -180,7 +176,6 @@ static int http_recv_open(struct receiver_node *rn) close(fd); return ret; } - rn->buf = para_calloc(BUFSIZE); rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data)); phd->fd = fd; phd->status = HTTP_CONNECTED; @@ -191,6 +186,7 @@ static int http_recv_open(struct receiver_node *rn) static void http_recv_free_config(void *conf) { http_recv_cmdline_parser_free(conf); + free(conf); } /**