X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=8bca7b7f04e237e4bfb0b477b828ae6678f9f2aa;hp=9b241efe722bc8d4f6e926a9077e0e32797b73e2;hb=ec58ecae85b1491efb1c25d78d83bc83b9e6a10b;hpb=75529c7cb29903302931db92f04cb3b510eb6317

diff --git a/client_common.c b/client_common.c
index 9b241efe..8bca7b7f 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)
@@ -134,13 +129,13 @@ void client_pre_select(struct sched *s, struct task *t)
 		pcd->check_w = 1;
 		return;
 
-	case CL_RECEIVING_SERVER_OUTPUT:
+	case CL_RECEIVING:
 		if (pcd->loaded < CLIENT_BUFSIZE - 1) {
 			para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
 			pcd->check_r = 1;
 		}
 		return;
-	case CL_SENDING_STDIN:
+	case CL_SENDING:
 		if (*pcd->in_loaded) {
 			PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
 			para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
@@ -274,11 +269,11 @@ void client_post_select(struct sched *s, struct task *t)
 			return;
 		t->ret = -E_HANDSHAKE_COMPLETE;
 		if (strstr(pcd->buf, AWAITING_DATA_MSG))
-			pcd->status = CL_SENDING_STDIN;
+			pcd->status = CL_SENDING;
 		else
-			pcd->status = CL_RECEIVING_SERVER_OUTPUT;
+			pcd->status = CL_RECEIVING;
 		return;
-	case CL_SENDING_STDIN: /* FIXME: might block */
+	case CL_SENDING: /* FIXME: might block */
 		PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
 		t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded);
 		if (t->ret <= 0) {
@@ -288,7 +283,7 @@ void client_post_select(struct sched *s, struct task *t)
 		}
 		*pcd->in_loaded = 0; /* FIXME: short writes */
 		return;
-	case CL_RECEIVING_SERVER_OUTPUT:
+	case CL_RECEIVING:
 		t->ret = client_recv_buffer(pcd);
 		return;
 	}
@@ -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,8 +306,6 @@ 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;