Kill fields buf, loaded and output_error of struct receiver node.

[paraslash.git] / client.c

diff --git a/client.c b/client.c
index 4ef458f8d676604f18a32758adf5621a88f4f942..9bdd0e82fa48499fc61c1319ec1564d7ddb0f278 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,14 +1,19 @@
 /*
- * 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 <regex.h>
+#include <openssl/rc4.h>
+#include <stdbool.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 +23,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_eof = &sit.eof;
+               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_eof = &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 +81,18 @@ int main(int argc, char *argv[])
 {
 
        int ret;
-       struct sched s;
+       static struct sched s;
 
+       init_random_seed_or_die();
        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;
-       ret = sched(&s);
+       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;
 }