X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=13c7fb57033d0a56dce0b685de741cb65dd88230;hp=71aef76ad3bcd49e6eccb9d1221addb4884bc96d;hb=7f9340341574044e16e1ffc30f856f13d1e3ba6c;hpb=3689799ede7bba230ca544ac953392b428c3d662 diff --git a/http_recv.c b/http_recv.c index 71aef76a..13c7fb57 100644 --- a/http_recv.c +++ b/http_recv.c @@ -166,31 +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; - struct hostent *he; 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; - 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; - /* init their_addr */ - init_sockaddr(&their_addr, conf->port_arg, he); - 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: