X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=8958cace8bf187ec2c09c2e8f98e8d27eaff06b3;hp=ff351e8902e42fba250345878d60d7d55df1db62;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=aa3fe79526bbce17f5ceec4d9c2d2246f01d6828

diff --git a/client_common.c b/client_common.c
index ff351e89..8958cace 100644
--- a/client_common.c
+++ b/client_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -44,12 +44,12 @@ void client_disconnect(struct client_task *ct)
 	if (ct->scc.fd >= 0)
 		close(ct->scc.fd);
 	free_argv(ct->features);
+	ct->features = NULL;
 	sc_free(ct->scc.recv);
 	ct->scc.recv = NULL;
 	sc_free(ct->scc.send);
 	ct->scc.send = NULL;
-	btr_free_node(ct->btrn);
-	ct->btrn = NULL;
+	btr_remove_node(&ct->btrn);
 }
 
 /**
@@ -240,6 +240,54 @@ static char **parse_features(char *buf)
 	return features;
 }
 
+static int dispatch_sbb(struct client_task *ct, struct sb_buffer *sbb)
+{
+	int ret;
+	const char *designator[] = {SB_DESIGNATORS_ARRAY};
+
+	if (!sbb)
+		return 0;
+	if (sbb->band < NUM_SB_DESIGNATORS)
+		PARA_DEBUG_LOG("band: %s\n", designator[sbb->band]);
+
+	switch (sbb->band) {
+	case SBD_OUTPUT:
+		if (iov_valid(&sbb->iov))
+			btr_add_output(sbb->iov.iov_base, sbb->iov.iov_len,
+				ct->btrn);
+		ret = 1;
+		goto out;
+	case SBD_DEBUG_LOG:
+	case SBD_INFO_LOG:
+	case SBD_NOTICE_LOG:
+	case SBD_WARNING_LOG:
+	case SBD_ERROR_LOG:
+	case SBD_CRIT_LOG:
+	case SBD_EMERG_LOG:
+		if (iov_valid(&sbb->iov)) {
+			int ll = sbb->band - SBD_DEBUG_LOG;
+			para_log(ll, "remote: %s", (char *)sbb->iov.iov_base);
+		}
+		ret = 1;
+		goto deallocate;
+	case SBD_EXIT__SUCCESS:
+		ret = -E_SERVER_CMD_SUCCESS;
+		goto deallocate;
+	case SBD_EXIT__FAILURE:
+		ret = -E_SERVER_CMD_FAILURE;
+		goto deallocate;
+	default:
+		PARA_ERROR_LOG("invalid band %d\n", sbb->band);
+		ret = -E_BAD_BAND;
+		goto deallocate;
+	}
+deallocate:
+	free(sbb->iov.iov_base);
+out:
+	sbb->iov.iov_base = NULL;
+	return ret;
+}
+
 static bool has_feature(const char *feature, struct client_task *ct)
 {
 	return find_arg(feature, ct->features) >= 0? true : false;
@@ -278,7 +326,7 @@ static int send_sb_command(struct client_task *ct)
  *
  * \sa struct sched, struct task.
  */
-static void client_post_select(struct sched *s, struct task *t)
+static int 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;
@@ -286,9 +334,11 @@ static void client_post_select(struct sched *s, struct task *t)
 	size_t n;
 	char buf[CLIENT_BUFSIZE];
 
-	t->error = 0;
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	if (ct->scc.fd < 0)
-		return;
+		return 0;
 	switch (ct->status) {
 	case CL_CONNECTED: /* receive welcome message */
 		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
@@ -296,10 +346,10 @@ static void client_post_select(struct sched *s, struct task *t)
 			goto out;
 		ct->features = parse_features(buf);
 		ct->status = CL_RECEIVED_WELCOME;
-		return;
+		return 0;
 	case CL_RECEIVED_WELCOME: /* send auth command */
 		if (!FD_ISSET(ct->scc.fd, &s->wfds))
-			return;
+			return 0;
 		if (has_feature("sideband", ct)) {
 			ct->use_sideband = true;
 			sprintf(buf, AUTH_REQUEST_MSG "%s sideband", ct->user);
@@ -310,7 +360,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		if (ret < 0)
 			goto out;
 		ct->status = CL_SENT_AUTH;
-		return;
+		return 0;
 	case CL_SENT_AUTH:
 		/*
 		 * Receive challenge and session keys, decrypt the challenge and
@@ -356,7 +406,7 @@ static void client_post_select(struct sched *s, struct task *t)
 		hash_to_asc(ct->challenge_hash, buf);
 		PARA_INFO_LOG("--> %s\n", buf);
 		ct->status = CL_RECEIVED_CHALLENGE;
-		return;
+		return 0;
 		}
 	case CL_RECEIVED_CHALLENGE:
 		if (ct->use_sideband) {
@@ -397,20 +447,20 @@ static void client_post_select(struct sched *s, struct task *t)
 		if (!strstr(buf, PROCEED_MSG))
 			goto out;
 		ct->status = CL_RECEIVED_PROCEED;
-		return;
+		return 0;
 		}
 	case CL_RECEIVED_PROCEED: /* concat args and send command */
 		{
 		int i;
 		char *command = NULL;
 		if (!FD_ISSET(ct->scc.fd, &s->wfds))
-			return;
+			return 0;
 		if (ct->use_sideband) {
 			ret = send_sb_command(ct);
 			if (ret <= 0)
 				goto out;
 			ct->status = CL_SENT_COMMAND;
-			return;
+			return 0;
 		}
 		for (i = 0; i < ct->conf.inputs_num; i++) {
 			char *tmp = command;
@@ -425,11 +475,25 @@ static void client_post_select(struct sched *s, struct task *t)
 		if (ret < 0)
 			goto out;
 		ct->status = CL_SENT_COMMAND;
-		return;
+		return 0;
 		}
 	case CL_SENT_COMMAND:
 		{
 		char *buf2;
+		if (ct->use_sideband) {
+			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;
+		}
 		/* can not use "buf" here because we need a malloced buffer */
 		buf2 = para_malloc(CLIENT_BUFSIZE);
 		ret = client_recv_buffer(ct, &s->rfds, buf2, CLIENT_BUFSIZE, &n);
@@ -437,7 +501,7 @@ static void client_post_select(struct sched *s, struct task *t)
 			if (strstr(buf2, AWAITING_DATA_MSG)) {
 				free(buf2);
 				ct->status = CL_SENDING;
-				return;
+				return 0;
 			}
 			ct->status = CL_RECEIVING;
 			btr_add_output(buf2, n, btrn);
@@ -453,15 +517,15 @@ static void client_post_select(struct sched *s, struct task *t)
 		if (ret < 0)
 			goto out;
 		if (ret == 0)
-			return;
+			return 0;
 		if (!FD_ISSET(ct->scc.fd, &s->wfds))
-			return;
+			return 0;
 		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;
+		return 0;
 		}
 	case CL_RECEIVING:
 		{
@@ -470,13 +534,20 @@ static void client_post_select(struct sched *s, struct task *t)
 		if (ret < 0)
 			goto out;
 		if (ret == 0)
-			return;
+			return 0;
 		/*
 		 * 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;
+			return 0;
+		if (ct->use_sideband) {
+			struct sb_buffer sbb;
+			ret = recv_sb(ct, &s->rfds, &sbb);
+			if (ret > 0)
+				ret = dispatch_sbb(ct, &sbb);
+			goto out;
+		}
 		buf2 = para_malloc(CLIENT_BUFSIZE);
 		ret = client_recv_buffer(ct, &s->rfds, buf2, CLIENT_BUFSIZE, &n);
 		if (n > 0) {
@@ -488,12 +559,13 @@ static void client_post_select(struct sched *s, struct task *t)
 		}
 	}
 out:
-	t->error = ret;
 	if (ret < 0) {
-		if (ret != -E_SERVER_EOF && ret != -E_BTR_EOF && ret != -E_EOF)
-			PARA_ERROR_LOG("%s\n", para_strerror(-t->error));
-		btr_remove_node(btrn);
+		if (!ct->use_sideband && ret != -E_SERVER_EOF &&
+				ret != -E_BTR_EOF && ret != -E_EOF)
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		btr_remove_node(&ct->btrn);
 	}
+	return ret;
 }
 
 /**
@@ -529,7 +601,7 @@ int client_connect(struct client_task *ct, struct sched *s,
 	ct->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "client", .parent = parent, .child = child));
 	ct->task.pre_select = client_pre_select;
-	ct->task.post_select = client_post_select;
+	ct->task.new_post_select = client_post_select;
 	ct->task.error = 0;
 	sprintf(ct->task.status, "client");
 	register_task(s, &ct->task);