X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=1aab14fbb43e82591472393cd177de13e015c1f2;hp=7c93b91722649a2a5386db892d444702025b07bd;hb=9492ba2d1b8f21af37436b121569e51a9b1df0c0;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a

diff --git a/client_common.c b/client_common.c
index 7c93b917..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;
@@ -263,8 +252,8 @@ static ssize_t client_recv_buffer(struct private_client_data *pcd)
  * \param t pointer to the task struct for this command
  *
  * Depending on the current state of the connection and the status of the read
- * and write fd sets of \a s, this function performs the neccessary steps to
- * authenticate the connection, to send the commmand given by \a
+ * and write fd sets of \a s, this function performs the necessary steps to
+ * authenticate the connection, to send the command given by \a
  * t->private_data and to receive para_server's output, if any.
  *
  * \sa struct sched, struct task