X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=fef6ba4a5bc4194048a951d9ceb657d91d14e4ae;hp=a37bc7e23b817f72beb353cba8abd824b56e6725;hb=afb43ec103ea5c0e194451c1289c514faee3b2e5;hpb=19d9318abf42debb15d833d4e56ab636893285c3

diff --git a/client.c b/client.c
index a37bc7e2..fef6ba4a 100644
--- a/client.c
+++ b/client.c
@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file client.c the client program used to connect to para_server */
 
+#include <openssl/rc4.h>
+
 #include "para.h"
 #include "list.h"
 #include "sched.h"
+#include "crypt.h"
 #include "client.cmdline.h"
 #include "string.h"
 #include "stdin.h"
@@ -18,44 +21,51 @@
 
 INIT_CLIENT_ERRLISTS;
 
-static struct private_client_data *pcd;
+static struct client_task *ct;
 static struct stdin_task sit;
 static struct stdout_task sot;
 
-
-INIT_STDERR_LOGGING(pcd->conf.loglevel_arg);
-
-static void client_event_handler(struct task *t)
+static void supervisor_post_select(__a_unused struct sched *s, struct task *t)
 {
-	struct private_client_data *p = t->private_data;
-
-	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
-	if (t->ret != -E_HANDSHAKE_COMPLETE) {
-		unregister_task(t);
-		p->eof = 1;
+	if (ct->task.error < 0) {
+		t->error = ct->task.error;
 		return;
 	}
-	if (p->status == CL_SENDING) {
+	if (ct->status == CL_SENDING) {
 		stdin_set_defaults(&sit);
 		sit.buf = para_malloc(sit.bufsize),
 		register_task(&sit.task);
-		p->inbuf = sit.buf;
-		p->in_loaded = &sit.loaded;
-		p->in_error = &sit.error;
+		ct->inbuf = sit.buf;
+		ct->in_loaded = &sit.loaded;
+		ct->in_error = &sit.task.error;
+		t->error = -E_TASK_STARTED;
+		return;
+	}
+	if (ct->status == CL_RECEIVING) {
+		stdout_set_defaults(&sot);
+		sot.bufp = &ct->buf;
+		sot.loaded = &ct->loaded;
+		sot.input_error = &ct->task.error;
+		register_task(&sot.task);
+		t->error = -E_TASK_STARTED;
 		return;
 	}
-	stdout_set_defaults(&sot);
-	sot.buf = p->buf;
-	sot.loaded = &p->loaded;
-	sot.input_error = &p->eof;
-	register_task(&sot.task);
 }
 
+static struct task svt = {
+	.post_select = supervisor_post_select,
+	.status = "supervisor task"
+};
+
+static int client_loglevel; /* loglevel */
+INIT_STDERR_LOGGING(client_loglevel);
+
+
 /**
- * the client program to connect to para_server
+ * The client program to connect to para_server.
  *
- * \param argc usual argument count
- * \param argv usual argument vector
+ * \param argc Usual argument count.
+ * \param argv Usual argument vector.
  *
  * It registers two tasks: The client task that communicates with para_server
  * and the standard out task that writes any output produced by the client task
@@ -69,17 +79,17 @@ int main(int argc, char *argv[])
 {
 
 	int ret;
-	struct sched s;
+	static struct sched s;
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
-	ret = client_open(argc, argv, &pcd);
-	if (ret < 0) /* can not use PARA_LOG here */
+	ret = client_open(argc, argv, &ct, &client_loglevel);
+	if (ret < 0) /* can not use PARA_LOG here because ct is NULL */
 		exit(EXIT_FAILURE);
-	pcd->task.event_handler = client_event_handler;
+	register_task(&svt);
 	ret = schedule(&s);
 	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	client_close(pcd);
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	client_close(ct);
 	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }