X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client_common.c;h=1aab14fbb43e82591472393cd177de13e015c1f2;hb=e1890028c21d233087266fd7997d68a88cb9afce;hp=9574c36f1f22cabbaa0f090fce9682dbd16ea3f7;hpb=7e58bd75a29d2d4e1d184191c2500b6aa7a7ad8a;p=paraslash.git

diff --git a/client_common.c b/client_common.c
index 9574c36f..1aab14fb 100644
--- a/client_common.c
+++ b/client_common.c
@@ -79,25 +79,14 @@ 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_nonblock(pcd->fd);
+	ret = mark_fd_nonblocking(pcd->fd);
 	if (ret < 0)
 		goto err_out;
 	pcd->task.pre_select = client_pre_select;