X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client_common.c;h=3ff43d1b7bffd2c1c2438078d431122ea9f6942d;hb=85a6aec201576a1ec57e78d91f73e45d9d6fae21;hp=cee76f8b9449d8b9bcd1b9af1db83ec7bdf03354;hpb=277ed4a605f68118aff9e671f16c0ac6edb1d55a;p=paraslash.git

diff --git a/client_common.c b/client_common.c
index cee76f8b..3ff43d1b 100644
--- a/client_common.c
+++ b/client_common.c
@@ -49,7 +49,8 @@ void client_disconnect(struct client_task *ct)
 	ct->scc.recv = NULL;
 	sc_free(ct->scc.send);
 	ct->scc.send = NULL;
-	btr_remove_node(&ct->btrn);
+	btr_remove_node(&ct->btrn[0]);
+	btr_remove_node(&ct->btrn[1]);
 }
 
 /**
@@ -69,7 +70,8 @@ void client_close(struct client_task *ct)
 	free(ct->key_file);
 	client_cmdline_parser_free(&ct->conf);
 	free(ct->challenge_hash);
-	sb_free(ct->sbc);
+	sb_free(ct->sbc[0]);
+	sb_free(ct->sbc[1]);
 	free(ct);
 }
 
@@ -91,7 +93,6 @@ static void client_pre_select(struct sched *s, struct task *t)
 {
 	int ret;
 	struct client_task *ct = container_of(t, struct client_task, task);
-	struct btr_node *btrn = ct->btrn;
 
 	if (ct->scc.fd < 0)
 		return;
@@ -99,7 +100,6 @@ static void client_pre_select(struct sched *s, struct task *t)
 	case CL_CONNECTED:
 	case CL_SENT_AUTH:
 	case CL_SENT_CH_RESPONSE:
-	case CL_SENT_COMMAND:
 		para_fd_set(ct->scc.fd, &s->rfds, &s->max_fileno);
 		return;
 
@@ -109,76 +109,49 @@ static void client_pre_select(struct sched *s, struct task *t)
 		para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
 		return;
 
-	case CL_RECEIVING:
-		ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-		if (ret != 0) {
+	case CL_SENDING:
+		if (ct->btrn[1]) {
+			ret = btr_node_status(ct->btrn[1], 0, BTR_NT_LEAF);
 			if (ret < 0)
 				sched_min_delay(s);
-			else
-				para_fd_set(ct->scc.fd, &s->rfds,
-					&s->max_fileno);
+			else if (ret > 0)
+				para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
 		}
-		return;
-	case CL_SENDING:
-		ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
-		if (ret != 0) {
+		/* fall though */
+	case CL_EXECUTING:
+		if (ct->btrn[0]) {
+			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);
 			if (ret < 0)
 				sched_min_delay(s);
-			else
-				para_fd_set(ct->scc.fd, &s->wfds,
-					&s->max_fileno);
+			else if (ret > 0)
+				para_fd_set(ct->scc.fd, &s->rfds, &s->max_fileno);
 		}
 		return;
 	}
 }
 
-static int client_recv_buffer(struct client_task *ct, fd_set *rfds,
-		char *buf, size_t sz, size_t *n)
-{
-	int ret;
-
-	if (ct->status < CL_SENT_CH_RESPONSE)
-		return read_nonblock(ct->scc.fd, buf, sz, rfds, n);
-
-	*n = 0;
-	ret = sc_recv_buffer(&ct->scc, buf, sz);
-	/*
-	 * sc_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;
-	if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
-		return 0;
-	if (ret < 0)
-		return ret;
-	*n = ret;
-	return 0;
-}
-
-static int send_sb(struct client_task *ct, void *buf, size_t numbytes,
+static int send_sb(struct client_task *ct, int channel, void *buf, size_t numbytes,
 		enum sb_designator band, bool dont_free)
 {
 	int ret, fd = ct->scc.fd;
 	struct iovec iov[2];
 
-	if (!ct->sbc) {
+	if (!ct->sbc[channel]) {
 		struct sb_buffer sbb;
 		sb_transformation trafo = ct->status < CL_RECEIVED_PROCEED?
 			NULL : sc_trafo;
 		sbb = (typeof(sbb))SBB_INIT(band, buf, numbytes);
-		ct->sbc = sb_new_send(&sbb, dont_free, trafo, ct->scc.send);
+		ct->sbc[channel] = sb_new_send(&sbb, dont_free, trafo, ct->scc.send);
 	}
-	ret = sb_get_send_buffers(ct->sbc, iov);
+	ret = sb_get_send_buffers(ct->sbc[channel], iov);
 	ret = xwritev(fd, iov, ret);
 	if (ret < 0) {
-		sb_free(ct->sbc);
-		ct->sbc = NULL;
+		sb_free(ct->sbc[channel]);
+		ct->sbc[channel] = NULL;
 		return ret;
 	}
-	if (sb_sent(ct->sbc, ret)) {
-		ct->sbc = NULL;
+	if (sb_sent(ct->sbc[channel], ret)) {
+		ct->sbc[channel] = NULL;
 		return 1;
 	}
 	return 0;
@@ -201,21 +174,21 @@ static int recv_sb(struct client_task *ct, fd_set *rfds,
 		trafo = sc_trafo;
 		trafo_context = ct->scc.recv;
 	}
-	if (!ct->sbc)
-		ct->sbc = sb_new_recv(0, trafo, trafo_context);
+	if (!ct->sbc[0])
+		ct->sbc[0] = sb_new_recv(0, trafo, trafo_context);
 again:
-	sb_get_recv_buffer(ct->sbc, &iov);
+	sb_get_recv_buffer(ct->sbc[0], &iov);
 	ret = read_nonblock(ct->scc.fd, iov.iov_base, iov.iov_len, rfds, &n);
 	if (ret < 0) {
-		sb_free(ct->sbc);
-		ct->sbc = NULL;
+		sb_free(ct->sbc[0]);
+		ct->sbc[0] = NULL;
 		return ret;
 	}
 	if (n == 0)
 		return 0;
-	if (!sb_received(ct->sbc, n, result))
+	if (!sb_received(ct->sbc[0], n, result))
 		goto again;
-	ct->sbc = NULL;
+	ct->sbc[0] = NULL;
 	return 1;
 }
 
@@ -251,10 +224,14 @@ static int dispatch_sbb(struct client_task *ct, struct sb_buffer *sbb)
 		PARA_DEBUG_LOG("band: %s\n", designator[sbb->band]);
 
 	switch (sbb->band) {
+	case SBD_AWAITING_DATA:
+		ct->status = CL_SENDING;
+		ret = 1;
+		goto out;
 	case SBD_OUTPUT:
 		if (iov_valid(&sbb->iov))
 			btr_add_output(sbb->iov.iov_base, sbb->iov.iov_len,
-				ct->btrn);
+				ct->btrn[0]);
 		ret = 1;
 		goto out;
 	case SBD_DEBUG_LOG:
@@ -299,8 +276,8 @@ static int send_sb_command(struct client_task *ct)
 	char *command, *p;
 	size_t len = 0;
 
-	if (ct->sbc)
-		return send_sb(ct, NULL, 0, 0, false);
+	if (ct->sbc[1])
+		return send_sb(ct, 0, NULL, 0, 0, false);
 
 	for (i = 0; i < ct->conf.inputs_num; i++)
 		len += strlen(ct->conf.inputs[i]) + 1;
@@ -310,7 +287,7 @@ static int send_sb_command(struct client_task *ct)
 		p += strlen(ct->conf.inputs[i]) + 1;
 	}
 	PARA_DEBUG_LOG("--> %s\n", command);
-	return send_sb(ct, command, len, SBD_COMMAND, false);
+	return send_sb(ct, 0, command, len, SBD_COMMAND, false);
 }
 
 /**
@@ -329,7 +306,6 @@ static int send_sb_command(struct client_task *ct)
 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];
@@ -341,7 +317,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		return;
 	switch (ct->status) {
 	case CL_CONNECTED: /* receive welcome message */
-		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+		ret = read_nonblock(ct->scc.fd, buf, sizeof(buf), &s->rfds, &n);
 		if (ret < 0 || n == 0)
 			goto out;
 		ct->features = parse_features(buf);
@@ -398,7 +374,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		return;
 		}
 	case CL_RECEIVED_CHALLENGE:
-		ret = send_sb(ct, ct->challenge_hash, HASH_SIZE,
+		ret = send_sb(ct, 0, ct->challenge_hash, HASH_SIZE,
 			SBD_CHALLENGE_RESPONSE, false);
 		if (ret != 0)
 			ct->challenge_hash = NULL;
@@ -426,66 +402,73 @@ static void client_post_select(struct sched *s, struct task *t)
 		ret = send_sb_command(ct);
 		if (ret <= 0)
 			goto out;
-		ct->status = CL_SENT_COMMAND;
+		ct->status = CL_EXECUTING;
 		return;
 		}
-	case CL_SENT_COMMAND:
-		{
-		struct sb_buffer sbb;
-		ret = recv_sb(ct, &s->rfds, &sbb);
-		if (ret <= 0)
-			goto out;
-		if (sbb.band == SBD_AWAITING_DATA) {
-			ct->status = CL_SENDING;
-			free(sbb.iov.iov_base);
-			goto out;
-		}
-		ct->status = CL_RECEIVING;
-		ret = dispatch_sbb(ct, &sbb);
-		goto out;
-		}
 	case CL_SENDING:
-		{
-		char *buf2;
-		size_t sz;
-		ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
-		if (ret < 0)
-			goto out;
-		if (ret == 0)
-			return;
-		if (!FD_ISSET(ct->scc.fd, &s->wfds))
-			return;
-		sz = btr_next_buffer(btrn, &buf2);
-		ret = sc_send_bin_buffer(&ct->scc, buf2, sz);
-		if (ret < 0)
-			goto out;
-		btr_consume(btrn, sz);
-		return;
+		if (ct->btrn[1]) {
+			char *buf2;
+			size_t sz;
+			ret = btr_node_status(ct->btrn[1], 0, BTR_NT_LEAF);
+			if (ret == -E_BTR_EOF) {
+				/* empty blob data packet indicates EOF */
+				PARA_INFO_LOG("blob sent\n");
+				ret = send_sb(ct, 1, NULL, 0, SBD_BLOB_DATA, true);
+				if (ret >= 0)
+					ret = -E_BTR_EOF;
+			}
+			if (ret < 0)
+				goto close1;
+			if (ret > 0 && FD_ISSET(ct->scc.fd, &s->wfds)) {
+				sz = btr_next_buffer(ct->btrn[1], &buf2);
+				assert(sz);
+				ret = send_sb(ct, 1, buf2, sz, SBD_BLOB_DATA, true);
+				if (ret < 0)
+					goto close1;
+				if (ret > 0)
+					btr_consume(ct->btrn[1], sz);
+			}
 		}
-	case CL_RECEIVING:
-		{
-		struct sb_buffer sbb;
-		ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-		if (ret < 0)
-			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->scc.fd, &s->rfds))
-			return;
-		ret = recv_sb(ct, &s->rfds, &sbb);
-		if (ret > 0)
-			ret = dispatch_sbb(ct, &sbb);
-		goto out;
+		/* fall though */
+	case CL_EXECUTING:
+		if (ct->btrn[0]) {
+			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);
+			if (ret < 0)
+				goto close0;
+			if (ret > 0 && FD_ISSET(ct->scc.fd, &s->rfds)) {
+				struct sb_buffer sbb;
+				ret = recv_sb(ct, &s->rfds, &sbb);
+				if (ret < 0)
+					goto close0;
+				if (ret > 0) {
+					ret = dispatch_sbb(ct, &sbb);
+					if (ret < 0)
+						goto close0;
+				}
+			}
 		}
+		ret = 0;
+		goto out;
 	}
+close1:
+	PARA_INFO_LOG("channel 1: %s\n", para_strerror(-ret));
+	btr_remove_node(&ct->btrn[1]);
+	if (ct->btrn[0])
+		return;
+	goto out;
+close0:
+	PARA_INFO_LOG("channel 0: %s\n", para_strerror(-ret));
+	btr_remove_node(&ct->btrn[0]);
+	if (ct->btrn[1] && ct->status == CL_SENDING)
+		return;
 out:
+	if (ret >= 0)
+		return;
+	btr_remove_node(&ct->btrn[0]);
+	btr_remove_node(&ct->btrn[1]);
+	if (ret != -E_SERVER_CMD_SUCCESS && ret != -E_SERVER_CMD_FAILURE)
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	t->error = ret;
-	if (ret < 0)
-		btr_remove_node(&ct->btrn);
 }
 
 /**
@@ -518,8 +501,10 @@ int client_connect(struct client_task *ct, struct sched *s,
 	if (ret < 0)
 		goto err_out;
 	ct->status = CL_CONNECTED;
-	ct->btrn = btr_new_node(&(struct btr_node_description)
-		EMBRACE(.name = "client", .parent = parent, .child = child));
+	ct->btrn[0] = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "client recv", .parent = NULL, .child = child));
+	ct->btrn[1] = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "client send", .parent = parent, .child = NULL));
 	ct->task.pre_select = client_pre_select;
 	ct->task.post_select = client_post_select;
 	ct->task.error = 0;