/*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * 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"
#include "stdout.h"
#include "client.h"
+#include "buffer_tree.h"
#include "error.h"
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;
+ t->error = -E_TASK_STARTED;
+ return;
+ }
+ if (ct->status == CL_RECEIVING) {
+ stdout_set_defaults(&sot);
+ 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 = LL_ERROR; /* 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
- * to standard out.
+ * and the supervisor task that minitors whether the client task intends to
+ * read from stdin or write to stdout.
+ *
+ * Once it has been determined whether the client command corresponds to a
+ * stdin command (addmood, addimg, ..), either the stdin task or the stdout
+ * task is set up to replace the supervisor task.
*
* \return EXIT_SUCCESS or EXIT_FAILURE
*
- * \sa client_open(), stdout.c, stdout.h, para_client(1), para_server(1)
+ * \sa client_open(), stdin.c, stdout.c, para_client(1), para_server(1)
*/
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 */
- exit(EXIT_FAILURE);
- pcd->task.event_handler = client_event_handler;
- ret = sched(&s);
+ /*
+ * We add buffer tree nodes for stdin and stdout even though
+ * only one of them will be needed. This simplifies the code
+ * a bit wrt. to the buffer tree setup.
+ */
+ sit.btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "stdin"));
+ ret = client_open(argc, argv, &ct, &client_loglevel, sit.btrn, NULL);
if (ret < 0)
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
- client_close(pcd);
- return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
+ goto out;
+ sot.btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "stdout", .parent = ct->btrn));
+ register_task(&svt);
+ ret = schedule(&s);
+out:
+ client_close(ct);
+ btr_free_node(sit.btrn);
+ btr_free_node(sot.btrn);
+ if (ret < 0) {
+ /* can not use PARA_LOG here because ct is NULL */
+ fprintf(stderr, "%s\n", para_strerror(-ret));
+ return EXIT_FAILURE;
+ }
+ return EXIT_SUCCESS;
}
projects / paraslash.git / blobdiff