X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=a7115fd75ac33495d9dd36862ff446757bd9666c;hp=f34f81bfc3b4aecc8cd4bdba5631e30116e4a352;hb=69a7e7aa11d8bf9b05d6431c57276befbc9b35a3;hpb=b0fe6d882dd35b01360a66e130d6714aff7b6a0d

diff --git a/client_common.c b/client_common.c
index f34f81bf..a7115fd7 100644
--- a/client_common.c
+++ b/client_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -107,17 +107,29 @@ static void client_pre_select(struct sched *s, struct task *t)
 	}
 }
 
-static ssize_t client_recv_buffer(struct client_task *ct, char *buf, size_t len)
+static int client_recv_buffer(struct client_task *ct, fd_set *rfds,
+		char *buf, size_t sz, size_t *n)
 {
-	ssize_t ret;
+	int ret;
 
 	if (ct->status < CL_SENT_CH_RESPONSE)
-		ret = recv_buffer(ct->rc4c.fd, buf, len);
-	else
-		ret = rc4_recv_buffer(&ct->rc4c, buf, len);
+		return read_nonblock(ct->rc4c.fd, buf, sz, rfds, n);
+
+	*n = 0;
+	ret = rc4_recv_buffer(&ct->rc4c, buf, sz);
+	/*
+	 * rc4_recv_buffer is used with blocking fds elsewhere, so it
+	 * does not use the nonblock-API. Therefore we need to
+	 * check for EOF and EAGAIN.
+	 */
 	if (ret == 0)
 		return -E_SERVER_EOF;
-	return ret;
+	if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
+		return 0;
+	if (ret < 0)
+		return ret;
+	*n = ret;
+	return 0;
 }
 
 /**
@@ -138,6 +150,7 @@ static void client_post_select(struct sched *s, struct task *t)
 	struct client_task *ct = container_of(t, struct client_task, task);
 	struct btr_node *btrn = ct->btrn;
 	int ret = 0;
+	size_t n;
 	char buf[CLIENT_BUFSIZE];
 
 	t->error = 0;
@@ -145,11 +158,9 @@ static void client_post_select(struct sched *s, struct task *t)
 		return;
 	switch (ct->status) {
 	case CL_CONNECTED: /* receive welcome message */
-		if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
-			return;
-		ret = client_recv_buffer(ct, buf, sizeof(buf));
-		if (ret < 0)
-			goto err;
+		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+		if (ret < 0 || n == 0)
+			goto out;
 		ct->status = CL_RECEIVED_WELCOME;
 		return;
 	case CL_RECEIVED_WELCOME: /* send auth command */
@@ -159,7 +170,7 @@ static void client_post_select(struct sched *s, struct task *t)
 			return;
 		ret = send_buffer(ct->rc4c.fd, buf);
 		if (ret < 0)
-			goto err;
+			goto out;
 		ct->status = CL_SENT_AUTH;
 		return;
 	case CL_SENT_AUTH:
@@ -173,16 +184,14 @@ static void client_post_select(struct sched *s, struct task *t)
 		/* the SHA1 of the decrypted challenge */
 		unsigned char challenge_sha1[HASH_SIZE];
 
-		if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
-			return;
-		ret = client_recv_buffer(ct, buf, sizeof(buf));
-		if (ret < 0)
-			goto err;
-		PARA_INFO_LOG("<-- [challenge] (%d bytes)\n", ret);
+		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+		if (ret < 0 || n == 0)
+			goto out;
+		PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", n);
 		ret = para_decrypt_buffer(ct->key_file, crypt_buf,
-			(unsigned char *)buf, ret);
+			(unsigned char *)buf, n);
 		if (ret < 0)
-			goto err;
+			goto out;
 		sha1_hash((char *)crypt_buf, CHALLENGE_SIZE, challenge_sha1);
 		RC4_set_key(&ct->rc4c.send_key, RC4_KEY_LEN,
 			crypt_buf + CHALLENGE_SIZE);
@@ -193,25 +202,21 @@ static void client_post_select(struct sched *s, struct task *t)
 		ret = send_bin_buffer(ct->rc4c.fd, (char *)challenge_sha1,
 			HASH_SIZE);
 		if (ret < 0)
-			goto err;
+			goto out;
 		ct->status = CL_SENT_CH_RESPONSE;
 		return;
 		}
 	case CL_SENT_CH_RESPONSE: /* read server response */
 		{
-		size_t bytes_received;
-		if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
-			return;
-		ret = client_recv_buffer(ct, buf, sizeof(buf));
-		if (ret < 0)
-			goto err;
-		bytes_received = ret;
+		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+		if (ret < 0 || n == 0)
+			goto out;
 		/* check if server has sent "Proceed" message */
 		ret = -E_CLIENT_AUTH;
-		if (bytes_received < PROCEED_MSG_LEN)
-			goto err;
+		if (n < PROCEED_MSG_LEN)
+			goto out;
 		if (!strstr(buf, PROCEED_MSG))
-			goto err;
+			goto out;
 		ct->status = CL_RECEIVED_PROCEED;
 		return;
 		}
@@ -232,30 +237,27 @@ static void client_post_select(struct sched *s, struct task *t)
 		ret = rc4_send_buffer(&ct->rc4c, command);
 		free(command);
 		if (ret < 0)
-			goto err;
+			goto out;
 		ct->status = CL_SENT_COMMAND;
 		return;
 		}
 	case CL_SENT_COMMAND:
 		{
 		char *buf2;
-		if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
-			return;
 		/* can not use "buf" here because we need a malloced buffer */
 		buf2 = para_malloc(CLIENT_BUFSIZE);
-		ret = client_recv_buffer(ct, buf2, CLIENT_BUFSIZE);
-		if (ret < 0) {
+		ret = client_recv_buffer(ct, &s->rfds, buf2, CLIENT_BUFSIZE, &n);
+		if (n > 0) {
+			if (strstr(buf2, AWAITING_DATA_MSG)) {
+				free(buf2);
+				ct->status = CL_SENDING;
+				return;
+			}
+			ct->status = CL_RECEIVING;
+			btr_add_output(buf2, n, btrn);
+		} else
 			free(buf2);
-			goto err;
-		}
-		if (strstr(buf2, AWAITING_DATA_MSG)) {
-			free(buf2);
-			ct->status = CL_SENDING;
-			return;
-		}
-		ct->status = CL_RECEIVING;
-		btr_add_output(buf2, ret, btrn);
-		return;
+		goto out;
 		}
 	case CL_SENDING:
 		{
@@ -263,7 +265,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		size_t sz;
 		ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
 		if (ret < 0)
-			goto err;
+			goto out;
 		if (ret == 0)
 			return;
 		if (!FD_ISSET(ct->rc4c.fd, &s->wfds))
@@ -271,7 +273,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		sz = btr_next_buffer(btrn, &buf2);
 		ret = rc4_send_bin_buffer(&ct->rc4c, buf2, sz);
 		if (ret < 0)
-			goto err;
+			goto out;
 		btr_consume(btrn, sz);
 		return;
 		}
@@ -280,23 +282,26 @@ static void client_post_select(struct sched *s, struct task *t)
 		char *buf2;
 		ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
 		if (ret < 0)
-			goto err;
+			goto out;
 		if (ret == 0)
 			return;
+		/*
+		 * The FD_ISSET() is not strictly necessary, but is allows us
+		 * to skip the malloc below if there is nothing to read anyway.
+		 */
 		if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
 			return;
 		buf2 = para_malloc(CLIENT_BUFSIZE);
-		ret = client_recv_buffer(ct, buf2, CLIENT_BUFSIZE);
-		if (ret < 0) {
+		ret = client_recv_buffer(ct, &s->rfds, buf2, CLIENT_BUFSIZE, &n);
+		if (n > 0) {
+			buf2 = para_realloc(buf2, n);
+			btr_add_output(buf2, n, btrn);
+		} else
 			free(buf2);
-			goto err;
-		}
-		buf2 = para_realloc(buf2, ret);
-		btr_add_output(buf2, ret, btrn);
-		return;
+		goto out;
 		}
 	}
-err:
+out:
 	t->error = ret;
 	if (ret < 0) {
 		if (ret != -E_SERVER_EOF && ret != -E_BTR_EOF)