X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=8ea41922c6976996d039912ec9f754fc29fd197f;hp=649a1b4fdf49579e653d7b6cd6d9c977524e6171;hb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;hpb=1745a87654ce08b57c46ce0870d8571eacbe27c9

diff --git a/client_common.c b/client_common.c
index 649a1b4f..8ea41922 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);
 }
 
 /**
@@ -326,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;
@@ -334,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);
@@ -344,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);
@@ -358,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
@@ -404,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) {
@@ -445,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;
@@ -473,7 +475,7 @@ 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:
 		{
@@ -499,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);
@@ -515,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:
 		{
@@ -532,13 +534,13 @@ 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);
@@ -557,13 +559,13 @@ static void client_post_select(struct sched *s, struct task *t)
 		}
 	}
 out:
-	t->error = ret;
 	if (ret < 0) {
 		if (!ct->use_sideband && ret != -E_SERVER_EOF &&
 				ret != -E_BTR_EOF && ret != -E_EOF)
-			PARA_ERROR_LOG("%s\n", para_strerror(-t->error));
-		btr_remove_node(btrn);
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		btr_remove_node(&ct->btrn);
 	}
+	return ret;
 }
 
 /**