X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=409c51df5973d51ec61f04091b322203c3c9a9e0;hp=c2ae2d315fc650f0e4fc6bd1dc267d34800a2983;hb=ef94bc193cdfc8076069ef1fa38cd21f5a3402e7;hpb=786010c598f79d20280e6ea9ea458cad4a7e9af7

diff --git a/client_common.c b/client_common.c
index c2ae2d31..409c51df 100644
--- a/client_common.c
+++ b/client_common.c
@@ -92,16 +92,11 @@ int client_parse_config(int argc, char *argv[],
 			&pcd->conf, 0, 0, 0);
 	ret = 1;
 	*pcd_ptr = pcd;
-	PARA_INFO_LOG(
-		"current loglevel: %d\n"
-		"using config_file: %s\n"
-		"using key_file: %s\n"
-		"connecting to %s:%d\n" ,
-		pcd->conf.loglevel_arg,
-		pcd->config_file,
-		pcd->key_file,
-		pcd->conf.hostname_arg, pcd->conf.server_port_arg
-	);
+	PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg);
+	PARA_INFO_LOG("config_file: %s\n", pcd->config_file);
+	PARA_INFO_LOG("key_file: %s\n", pcd->key_file);
+	PARA_NOTICE_LOG("connecting %s:%d\n", pcd->conf.hostname_arg,
+		pcd->conf.server_port_arg);
 out:
 	free(home);
 	if (ret < 0)
@@ -301,9 +296,6 @@ int client_open(struct private_client_data *pcd)
 	struct hostent *he;
 	struct sockaddr_in their_addr;
 
-	/* get the host info */
-	PARA_NOTICE_LOG("getting host info of %s\n",
-		pcd->conf.hostname_arg);
 	ret = get_host_info(pcd->conf.hostname_arg, &he);
 	if (ret < 0)
 		goto out;
@@ -314,12 +306,13 @@ int client_open(struct private_client_data *pcd)
 	pcd->fd = ret;
 	/* init their_addr */
 	init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
-	/* connect */
-	PARA_NOTICE_LOG("connecting to %s\n", pcd->conf.hostname_arg);
 	ret = para_connect(pcd->fd, &their_addr);
 	if (ret < 0)
 		goto out;
 	pcd->status = CL_CONNECTED;
+	ret = mark_fd_nonblock(pcd->fd);
+	if (ret < 0)
+		goto out;
 	pcd->task.pre_select = client_pre_select;
 	pcd->task.post_select = client_post_select;
 	pcd->task.private_data = pcd;