X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=1aab14fbb43e82591472393cd177de13e015c1f2;hp=4266ddb2af101999fcd885efbd32e4d7db663d14;hb=025bd85e6a7c4618b4741762982b37df35eb7725;hpb=89b30ef7b5ee1bb73b8efa3ccbb53c229066439e diff --git a/client_common.c b/client_common.c index 4266ddb2..1aab14fb 100644 --- a/client_common.c +++ b/client_common.c @@ -79,23 +79,12 @@ void client_close(struct private_client_data *pcd) static int client_connect(struct private_client_data *pcd) { int ret; - struct hostent *he; - struct sockaddr_in their_addr; pcd->fd = -1; - ret = get_host_info(pcd->conf.hostname_arg, &he); - if (ret < 0) - return ret; - /* get new socket */ - ret = get_stream_socket(AF_INET); + ret = tcp_connect(pcd->conf.hostname_arg, pcd->conf.server_port_arg); if (ret < 0) return ret; pcd->fd = ret; - /* init their_addr */ - init_sockaddr(&their_addr, pcd->conf.server_port_arg, he); - ret = PARA_CONNECT(pcd->fd, &their_addr); - if (ret < 0) - goto err_out; pcd->status = CL_CONNECTED; ret = mark_fd_nonblocking(pcd->fd); if (ret < 0)