X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=3522060895928758a52833d97b27baf669005bee;hp=fdc9a5345a8358fc55c9641b7a123c59b22237dd;hb=e6940831fbcf21dd0e6243ca89ea0c7f8b195d9e;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde

diff --git a/client_common.c b/client_common.c
index fdc9a534..35220608 100644
--- a/client_common.c
+++ b/client_common.c
@@ -33,8 +33,8 @@
 static void rc4_send(unsigned long len, const unsigned char *indata,
 		unsigned char *outdata, void *private_data)
 {
-	struct private_client_data *pcd = private_data;
-	RC4(&pcd->rc4_send_key, len, indata, outdata);
+	struct client_task *ct = private_data;
+	RC4(&ct->rc4_send_key, len, indata, outdata);
 }
 
 /*
@@ -45,30 +45,30 @@ static void rc4_send(unsigned long len, const unsigned char *indata,
 static void rc4_recv(unsigned long len, const unsigned char *indata,
 		unsigned char *outdata, void *private_data)
 {
-	struct private_client_data *pcd = private_data;
-	RC4(&pcd->rc4_recv_key, len, indata, outdata);
+	struct client_task *ct = private_data;
+	RC4(&ct->rc4_recv_key, len, indata, outdata);
 }
 
 /**
  * Close the connection to para_server and free all resources.
  *
- * \param pcd Pointer to the client data.
+ * \param ct Pointer to the client data.
  *
  * \sa client_open.
  */
-void client_close(struct private_client_data *pcd)
+void client_close(struct client_task *ct)
 {
-	if (!pcd)
+	if (!ct)
 		return;
-	if (pcd->fd >= 0) {
-		disable_crypt(pcd->fd);
-		close(pcd->fd);
+	if (ct->fd >= 0) {
+		disable_crypt(ct->fd);
+		close(ct->fd);
 	}
-	free(pcd->user);
-	free(pcd->config_file);
-	free(pcd->key_file);
-	client_cmdline_parser_free(&pcd->conf);
-	free(pcd);
+	free(ct->user);
+	free(ct->config_file);
+	free(ct->key_file);
+	client_cmdline_parser_free(&ct->conf);
+	free(ct);
 }
 
 /**
@@ -87,43 +87,42 @@ void client_close(struct private_client_data *pcd)
  */
 static void client_pre_select(struct sched *s, struct task *t)
 {
-	struct private_client_data *pcd = t->private_data;
+	struct client_task *ct = container_of(t, struct client_task, task);
 
-	t->ret = 1;
-	pcd->check_r = 0;
-	pcd->check_w = 0;
-	if (pcd->fd < 0)
+	ct->check_r = 0;
+	ct->check_w = 0;
+	if (ct->fd < 0)
 		return;
-	switch (pcd->status) {
+	switch (ct->status) {
 	case CL_CONNECTED:
 	case CL_SENT_AUTH:
 	case CL_SENT_CH_RESPONSE:
 	case CL_SENT_COMMAND:
-		para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
-		pcd->check_r = 1;
+		para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
+		ct->check_r = 1;
 		return;
 
 	case CL_RECEIVED_WELCOME:
 	case CL_RECEIVED_CHALLENGE:
 	case CL_RECEIVED_PROCEED:
-		para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
-		pcd->check_w = 1;
+		para_fd_set(ct->fd, &s->wfds, &s->max_fileno);
+		ct->check_w = 1;
 		return;
 
 	case CL_RECEIVING:
-		if (pcd->loaded < CLIENT_BUFSIZE - 1) {
-			para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
-			pcd->check_r = 1;
+		if (ct->loaded < CLIENT_BUFSIZE - 1) {
+			para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
+			ct->check_r = 1;
 		}
 		return;
 	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);
-			pcd->check_w = 1;
+		if (*ct->in_loaded) {
+			PARA_INFO_LOG("loaded: %zd\n", *ct->in_loaded);
+			para_fd_set(ct->fd, &s->wfds, &s->max_fileno);
+			ct->check_w = 1;
 		} else {
-			if (*pcd->in_error) {
-				t->ret = *pcd->in_error;
+			if (*ct->in_error) {
+				t->error = *ct->in_error;
 				s->timeout.tv_sec = 0;
 				s->timeout.tv_usec = 1;
 			}
@@ -132,14 +131,14 @@ static void client_pre_select(struct sched *s, struct task *t)
 	}
 }
 
-static ssize_t client_recv_buffer(struct private_client_data *pcd)
+static ssize_t client_recv_buffer(struct client_task *ct)
 {
-	ssize_t ret = recv_buffer(pcd->fd, pcd->buf + pcd->loaded,
-		CLIENT_BUFSIZE - pcd->loaded);
+	ssize_t ret = recv_buffer(ct->fd, ct->buf + ct->loaded,
+		CLIENT_BUFSIZE - ct->loaded);
 	if (!ret)
 		return -E_SERVER_EOF;
 	if (ret > 0)
-		pcd->loaded += ret;
+		ct->loaded += ret;
 	return ret;
 
 }
@@ -159,151 +158,148 @@ static ssize_t client_recv_buffer(struct private_client_data *pcd)
  */
 static void client_post_select(struct sched *s, struct task *t)
 {
-	struct private_client_data *pcd = t->private_data;
+	struct client_task *ct = container_of(t, struct client_task, task);
 
-//	PARA_INFO_LOG("status %d\n", pcd->status);
-	t->ret = 1;
-	if (pcd->fd < 0)
+	t->error = 0;
+	if (ct->fd < 0)
 		return;
-	if (!pcd->check_r && !pcd->check_w)
+	if (!ct->check_r && !ct->check_w)
 		return;
-	if (pcd->check_r && !FD_ISSET(pcd->fd, &s->rfds))
+	if (ct->check_r && !FD_ISSET(ct->fd, &s->rfds))
 		return;
-	if (pcd->check_w && !FD_ISSET(pcd->fd, &s->wfds))
+	if (ct->check_w && !FD_ISSET(ct->fd, &s->wfds))
 		return;
-	switch (pcd->status) {
+	switch (ct->status) {
 	case CL_CONNECTED: /* receive welcome message */
-		t->ret = client_recv_buffer(pcd);
-		if (t->ret > 0)
-			pcd->status = CL_RECEIVED_WELCOME;
+		t->error = client_recv_buffer(ct);
+		if (t->error > 0)
+			ct->status = CL_RECEIVED_WELCOME;
 		return;
 	case CL_RECEIVED_WELCOME: /* send auth command */
-		sprintf(pcd->buf, "auth %s%s", pcd->conf.plain_given?
-			"" : "rc4 ", pcd->user);
-		PARA_INFO_LOG("--> %s\n", pcd->buf);
-		t->ret = send_buffer(pcd->fd, pcd->buf);
-		if (t->ret >= 0)
-			pcd->status = CL_SENT_AUTH;
+		sprintf(ct->buf, "auth %s%s", ct->conf.plain_given?
+			"" : "rc4 ", ct->user);
+		PARA_INFO_LOG("--> %s\n", ct->buf);
+		t->error = send_buffer(ct->fd, ct->buf);
+		if (t->error >= 0)
+			ct->status = CL_SENT_AUTH;
 		return;
 	case CL_SENT_AUTH: /* receive challenge number */
-		pcd->loaded = 0;
-		t->ret = client_recv_buffer(pcd);
-		if (t->ret < 0)
+		ct->loaded = 0;
+		t->error = client_recv_buffer(ct);
+		if (t->error < 0)
 			return;
-		if (t->ret != 64) {
-			t->ret = -E_INVALID_CHALLENGE;
-			PARA_ERROR_LOG("received the following: %s\n", pcd->buf);
+		if (t->error != 64) {
+			t->error = -E_INVALID_CHALLENGE;
+			PARA_ERROR_LOG("received the following: %s\n", ct->buf);
 			return;
 		}
-		PARA_INFO_LOG("%s", "<-- [challenge]\n");
+		PARA_INFO_LOG("<-- [challenge]\n");
 		/* decrypt challenge number */
-		t->ret = para_decrypt_challenge(pcd->key_file, &pcd->challenge_nr,
-			(unsigned char *) pcd->buf, 64);
-		if (t->ret > 0)
-			pcd->status = CL_RECEIVED_CHALLENGE;
+		t->error = para_decrypt_challenge(ct->key_file, &ct->challenge_nr,
+			(unsigned char *) ct->buf, 64);
+		if (t->error > 0)
+			ct->status = CL_RECEIVED_CHALLENGE;
 		return;
 	case CL_RECEIVED_CHALLENGE: /* send decrypted challenge */
-		PARA_INFO_LOG("--> %lu\n", pcd->challenge_nr);
-		t->ret = send_va_buffer(pcd->fd, "%s%lu", CHALLENGE_RESPONSE_MSG,
-			pcd->challenge_nr);
-		if (t->ret > 0)
-			pcd->status = CL_SENT_CH_RESPONSE;
+		PARA_INFO_LOG("--> %lu\n", ct->challenge_nr);
+		t->error = send_va_buffer(ct->fd, "%s%lu", CHALLENGE_RESPONSE_MSG,
+			ct->challenge_nr);
+		if (t->error > 0)
+			ct->status = CL_SENT_CH_RESPONSE;
 		return;
 	case CL_SENT_CH_RESPONSE: /* read server response */
 		{
 		size_t bytes_received;
 		unsigned char rc4_buf[2 * RC4_KEY_LEN] = "";
-		pcd->loaded = 0;
-		t->ret = client_recv_buffer(pcd);
-		if (t->ret < 0)
+		ct->loaded = 0;
+		t->error = client_recv_buffer(ct);
+		if (t->error < 0)
 			return;
-		bytes_received = t->ret;
+		bytes_received = t->error;
 		PARA_DEBUG_LOG("++++ server info ++++\n%s\n++++ end of server "
-			"info ++++\n", pcd->buf);
+			"info ++++\n", ct->buf);
 		/* check if server has sent "Proceed" message */
-		t->ret = -E_CLIENT_AUTH;
-		if (!strstr(pcd->buf, PROCEED_MSG))
+		t->error = -E_CLIENT_AUTH;
+		if (!strstr(ct->buf, PROCEED_MSG))
 			return;
-		t->ret = 1;
-		pcd->status = CL_RECEIVED_PROCEED;
+		t->error = 0;
+		ct->status = CL_RECEIVED_PROCEED;
 		if (bytes_received < PROCEED_MSG_LEN + 32)
 			return;
-		PARA_INFO_LOG("%s", "decrypting session key\n");
-		t->ret = para_decrypt_buffer(pcd->key_file, rc4_buf,
-			(unsigned char *)pcd->buf + PROCEED_MSG_LEN + 1,
+		PARA_INFO_LOG("decrypting session key\n");
+		t->error = para_decrypt_buffer(ct->key_file, rc4_buf,
+			(unsigned char *)ct->buf + PROCEED_MSG_LEN + 1,
 			bytes_received - PROCEED_MSG_LEN - 1);
-		if (t->ret < 0)
+		if (t->error < 0)
 			return;
-		RC4_set_key(&pcd->rc4_send_key, RC4_KEY_LEN, rc4_buf);
-		RC4_set_key(&pcd->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
-		enable_crypt(pcd->fd, rc4_recv, rc4_send, pcd);
+		RC4_set_key(&ct->rc4_send_key, RC4_KEY_LEN, rc4_buf);
+		RC4_set_key(&ct->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
+		enable_crypt(ct->fd, rc4_recv, rc4_send, ct);
 		}
 	case CL_RECEIVED_PROCEED: /* concat args and send command */
 		{
 		int i;
 		char *command = NULL;
-		for (i = 0; i < pcd->conf.inputs_num; i++) {
+		for (i = 0; i < ct->conf.inputs_num; i++) {
 			char *tmp = command;
 			command = make_message("%s\n%s", command?
-				command : "", pcd->conf.inputs[i]);
+				command : "", ct->conf.inputs[i]);
 			free(tmp);
 		}
 		command = para_strcat(command, EOC_MSG "\n");
 		PARA_DEBUG_LOG("--> %s\n", command);
-		t->ret = send_buffer(pcd->fd, command);
+		t->error = send_buffer(ct->fd, command);
 		free(command);
-		if (t->ret > 0)
-			pcd->status = CL_SENT_COMMAND;
+		if (t->error > 0)
+			ct->status = CL_SENT_COMMAND;
 		return;
 		}
 	case CL_SENT_COMMAND:
-		pcd->loaded = 0;
-		t->ret = client_recv_buffer(pcd);
-		if (t->ret < 0)
+		ct->loaded = 0;
+		t->error = client_recv_buffer(ct);
+		if (t->error < 0)
 			return;
-		t->ret = -E_HANDSHAKE_COMPLETE;
-		if (strstr(pcd->buf, AWAITING_DATA_MSG))
-			pcd->status = CL_SENDING;
+		if (strstr(ct->buf, AWAITING_DATA_MSG))
+			ct->status = CL_SENDING;
 		else
-			pcd->status = CL_RECEIVING;
+			ct->status = CL_RECEIVING;
 		return;
 	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)
+		PARA_INFO_LOG("loaded: %zd\n", *ct->in_loaded);
+		t->error = send_bin_buffer(ct->fd, ct->inbuf, *ct->in_loaded);
+		if (t->error < 0)
 			return;
-		*pcd->in_loaded = 0;
+		*ct->in_loaded = 0;
 		return;
 	case CL_RECEIVING:
-		t->ret = client_recv_buffer(pcd);
+		t->error = client_recv_buffer(ct);
 		return;
 	}
 }
 
 /* connect to para_server and register the client task */
-static int client_connect(struct private_client_data *pcd)
+static int client_connect(struct client_task *ct)
 {
 	int ret;
 
-	pcd->fd = -1;
-	ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, pcd->conf.hostname_arg,
-		pcd->conf.server_port_arg);
+	ct->fd = -1;
+	ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, ct->conf.hostname_arg,
+		ct->conf.server_port_arg);
 	if (ret < 0)
 		return ret;
-	pcd->fd = ret;
-	pcd->status = CL_CONNECTED;
-	ret = mark_fd_nonblocking(pcd->fd);
+	ct->fd = ret;
+	ct->status = CL_CONNECTED;
+	ret = mark_fd_nonblocking(ct->fd);
 	if (ret < 0)
 		goto err_out;
-	pcd->task.pre_select = client_pre_select;
-	pcd->task.post_select = client_post_select;
-	pcd->task.private_data = pcd;
-	sprintf(pcd->task.status, "client");
-	register_task(&pcd->task);
+	ct->task.pre_select = client_pre_select;
+	ct->task.post_select = client_post_select;
+	sprintf(ct->task.status, "client");
+	register_task(&ct->task);
 	return 1;
 err_out:
-	close(pcd->fd);
-	pcd->fd = -1;
+	close(ct->fd);
+	ct->fd = -1;
 	return ret;
 }
 
@@ -312,8 +308,8 @@ err_out:
  *
  * \param argc Usual argument count.
  * \param argv Usual argument vector.
- * \param pcd_ptr Points to dynamically allocated and initialized private client data
- * upon successful return.
+ * \param ct_ptr Points to dynamically allocated and initialized client task
+ * struct upon successful return.
  *
  * Check the command line options given by \a argc and argv, set default values
  * for user name and rsa key file, read further option from the config file.
@@ -321,33 +317,32 @@ err_out:
  *
  * \return Standard.
  */
-int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr)
+int client_open(int argc, char *argv[], struct client_task **ct_ptr)
 {
 	char *home = para_homedir();
 	struct stat statbuf;
 	int ret;
-	struct private_client_data *pcd =
-		para_calloc(sizeof(struct private_client_data));
+	struct client_task *ct = para_calloc(sizeof(struct client_task));
 
-	*pcd_ptr = pcd;
-	pcd->fd = -1;
-	ret = client_cmdline_parser(argc, argv, &pcd->conf);
-	HANDLE_VERSION_FLAG("client", pcd->conf);
+	*ct_ptr = ct;
+	ct->fd = -1;
+	ret = client_cmdline_parser(argc, argv, &ct->conf);
+	HANDLE_VERSION_FLAG("client", ct->conf);
 	ret = -E_CLIENT_SYNTAX;
-	if (!pcd->conf.inputs_num)
+	if (!ct->conf.inputs_num)
 		goto out;
-	pcd->user = pcd->conf.user_given?
-		para_strdup(pcd->conf.user_arg) : para_logname();
+	ct->user = ct->conf.user_given?
+		para_strdup(ct->conf.user_arg) : para_logname();
 
-	pcd->key_file = pcd->conf.key_file_given?
-		para_strdup(pcd->conf.key_file_arg) :
-		make_message("%s/.paraslash/key.%s", home, pcd->user);
+	ct->key_file = ct->conf.key_file_given?
+		para_strdup(ct->conf.key_file_arg) :
+		make_message("%s/.paraslash/key.%s", home, ct->user);
 
-	pcd->config_file = pcd->conf.config_file_given?
-		para_strdup(pcd->conf.config_file_arg) :
+	ct->config_file = ct->conf.config_file_given?
+		para_strdup(ct->conf.config_file_arg) :
 		make_message("%s/.paraslash/client.conf", home);
-	ret = stat(pcd->config_file, &statbuf);
-	if (ret && pcd->conf.config_file_given) {
+	ret = stat(ct->config_file, &statbuf);
+	if (ret && ct->conf.config_file_given) {
 		ret = -E_NO_CONFIG;
 		goto out;
 	}
@@ -358,22 +353,22 @@ int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr)
 			.check_required = 0,
 			.check_ambiguity = 0
 		};
-		client_cmdline_parser_config_file(pcd->config_file,
-			&pcd->conf, &params);
+		client_cmdline_parser_config_file(ct->config_file,
+			&ct->conf, &params);
 	}
 	ret = 1;
-	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);
-	ret = client_connect(pcd);
+	PARA_INFO_LOG("loglevel: %d\n", ct->conf.loglevel_arg);
+	PARA_INFO_LOG("config_file: %s\n", ct->config_file);
+	PARA_INFO_LOG("key_file: %s\n", ct->key_file);
+	PARA_NOTICE_LOG("connecting %s:%d\n", ct->conf.hostname_arg,
+		ct->conf.server_port_arg);
+	ret = client_connect(ct);
 out:
 	free(home);
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-		client_close(pcd);
-		*pcd_ptr = NULL;
+		client_close(ct);
+		*ct_ptr = NULL;
 	}
 	return ret;
 }