/*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 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 <signal.h>
+
#include "para.h"
#include "list.h"
#include "sched.h"
-#include "config.h"
-#include "client.cmdline.h"
#include "crypt.h"
-#include "rc4.h"
-#include <openssl/rc4.h>
-#include "net.h"
-#include "fd.h"
+#include "client.cmdline.h"
#include "string.h"
#include "stdin.h"
#include "stdout.h"
+#include "client.h"
+#include "buffer_tree.h"
#include "error.h"
-
-enum {
- CL_CONNECTED,
- CL_RECEIVED_WELCOME,
- CL_SENT_AUTH,
- CL_RECEIVED_CHALLENGE,
- CL_SENT_CH_RESPONSE,
- CL_RECEIVED_PROCEED,
- CL_SENT_COMMAND,
- CL_SENDING_STDIN,
- CL_RECEIVING_SERVER_OUTPUT
-};
-
-#define CLIENT_BUFSIZE 8192
-
-struct private_client_data {
- int status;
- int fd;
- struct client_args_info conf;
- char *config_file;
- char *key_file;
- char *user;
- RC4_KEY rc4_recv_key;
- RC4_KEY rc4_send_key;
- struct task task;
- int eof;
- char buf[CLIENT_BUFSIZE];
- size_t loaded;
- int check_r;
- int check_w;
- long unsigned challenge_nr;
- /* only used if stdin gets sent to para_server */
- char *inbuf;
- size_t *in_loaded;
- int *in_eof;
-};
+#include "version.h"
INIT_CLIENT_ERRLISTS;
-static struct private_client_data *pcd;
+static struct sched sched;
+static struct client_task *ct;
static struct stdin_task sit;
static struct stdout_task sot;
+static int client_loglevel = LL_ERROR;
+DEFINE_STDERR_LOGGER(stderr_log, client_loglevel);
+__printf_2_3 void (*para_log)(int, const char*, ...) = stderr_log;
-static void rc4_send(unsigned long len, const unsigned char *indata,
- unsigned char *outdata)
-{
- RC4(&pcd->rc4_send_key, len, indata, outdata);
-}
+#ifdef HAVE_READLINE
+#include "interactive.h"
+#include "server_completion.h"
+#include "afs_completion.h"
-static void rc4_recv(unsigned long len, const unsigned char *indata,
- unsigned char *outdata)
+struct exec_task {
+ struct task task;
+ struct btr_node *btrn;
+ char *result_buf;
+ size_t result_size;
+};
+
+static void exec_pre_select(struct sched *s, struct task *t)
{
- RC4(&pcd->rc4_recv_key, len, indata, outdata);
-}
+ struct exec_task *et = container_of(t, struct exec_task, task);
+ int ret = btr_node_status(et->btrn, 0, BTR_NT_LEAF);
+ if (ret != 0)
+ sched_min_delay(s);
+}
-/*
- * client log function
- */
-void para_log(int ll, const char* fmt,...)
+static void exec_post_select(__a_unused struct sched *s, struct task *t)
{
- va_list argp;
+ struct exec_task *et = container_of(t, struct exec_task, task);
+ struct btr_node *btrn = et->btrn;
+ char *buf;
+ size_t sz;
+ int ret;
- /* ignore log message if loglevel is not high enough */
- if (pcd && ll < pcd->conf.loglevel_arg)
+ ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+ if (ret <= 0) {
+ t->error = ret;
return;
- va_start(argp, fmt);
- vfprintf(stderr, fmt, argp);
- va_end(argp);
+ }
+ sz = btr_next_buffer(btrn, &buf);
+ if (sz <= 1)
+ goto out;
+ et->result_buf = para_realloc(et->result_buf, et->result_size + sz - 1);
+ memcpy(et->result_buf + et->result_size - 1, buf, sz - 1);
+ et->result_size += sz - 1;
+ et->result_buf[et->result_size - 1] = '\0';
+out:
+ btr_consume(btrn, sz);
}
-static void client_close(struct private_client_data *pcd)
+static int make_client_argv(const char *line)
{
- if (pcd)
- return;
- if (pcd->fd >= 0)
- close(pcd->fd);
- free(pcd->user);
- free(pcd->config_file);
- free(pcd->key_file);
- free(pcd);
+ int ret;
+
+ free_argv(ct->conf.inputs);
+ ret = create_argv(line, " ", &ct->conf.inputs);
+ if (ret >= 0)
+ ct->conf.inputs_num = ret;
+ return ret;
}
-static int client_parse_config(int argc, char *argv[],
- struct private_client_data **pcd_ptr)
+static int execute_client_command(const char *cmd, char **result)
{
- char *home = para_homedir();
- struct stat statbuf;
int ret;
- struct private_client_data *p =
- para_calloc(sizeof(struct private_client_data));
-
- p->fd = -1;
- cmdline_parser(argc, argv, &p->conf);
- ret = - E_CLIENT_SYNTAX;
- if (!p->conf.inputs_num)
+ struct sched command_sched = {.default_timeout = {.tv_sec = 1}};
+ struct exec_task exec_task = {
+ .task = {
+ .pre_select = exec_pre_select,
+ .post_select = exec_post_select,
+ .status = "client exec task",
+ },
+ .result_buf = para_strdup(""),
+ .result_size = 1,
+ };
+ *result = NULL;
+ ret = make_client_argv(cmd);
+ if (ret < 0)
goto out;
- p->user = p->conf.user_given?
- para_strdup(p->conf.user_arg) : para_logname();
-
- p->key_file = p->conf.key_file_given?
- para_strdup(p->conf.key_file_arg) :
- make_message("%s/.paraslash/key.%s", home, p->user);
-
- p->config_file = p->conf.config_file_given?
- para_strdup(p->conf.config_file_arg) :
- make_message("%s/.paraslash/client.conf", home);
- ret = stat(p->config_file, &statbuf);
- if (ret && p->conf.config_file_given) {
- ret = -E_NO_CONFIG;
+ exec_task.btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "exec_collect"));
+ register_task(&command_sched, &exec_task.task);
+ ret = client_connect(ct, &command_sched, NULL, exec_task.btrn);
+ if (ret < 0)
goto out;
- }
- if (!ret)
- cmdline_parser_configfile(p->config_file, &p->conf, 0, 0, 0);
+ schedule(&command_sched);
+ *result = exec_task.result_buf;
+ btr_remove_node(exec_task.btrn);
+ client_disconnect(ct);
ret = 1;
- *pcd_ptr = p;
- PARA_INFO_LOG(
- "current loglevel: %d\n"
- "using config_file: %s\n"
- "using key_file: %s\n"
- "connecting to %s:%d\n" ,
- p->conf.loglevel_arg,
- p->config_file,
- p->key_file,
- p->conf.hostname_arg, p->conf.server_port_arg
- );
out:
- free(home);
+ btr_free_node(exec_task.btrn);
if (ret < 0)
- client_close(p);
+ free(exec_task.result_buf);
return ret;
}
-static void client_pre_select(struct sched *s, struct task *t)
+static int extract_matches_from_command(const char *word, char *cmd,
+ char ***matches)
{
- struct private_client_data *p = t->private_data;
+ char *buf, **sl;
+ int ret;
- PARA_INFO_LOG("status %d\n", p->status);
- t->ret = 1;
- pcd->check_r = 0;
- pcd->check_w = 0;
- if (p->fd < 0)
- return;
- switch (pcd->status) {
- case CL_CONNECTED:
- case CL_SENT_AUTH:
- case CL_SENT_CH_RESPONSE:
- case CL_SENT_COMMAND:
- para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
- pcd->check_r = 1;
- return;
+ ret = execute_client_command(cmd, &buf);
+ if (ret < 0)
+ return ret;
+ ret = create_argv(buf, "\n", &sl);
+ free(buf);
+ if (ret < 0)
+ return ret;
+ ret = i9e_extract_completions(word, sl, matches);
+ free_argv(sl);
+ return ret;
+}
- case CL_RECEIVED_WELCOME:
- case CL_RECEIVED_CHALLENGE:
- case CL_RECEIVED_PROCEED:
- para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
- pcd->check_w = 1;
- return;
+static int complete_attributes(const char *word, char ***matches)
+{
+ return extract_matches_from_command(word, "lsatt", matches);
+}
- case CL_RECEIVING_SERVER_OUTPUT:
- if (pcd->loaded < CLIENT_BUFSIZE - 1) {
- para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
- p->check_r = 1;
- }
- return;
- case CL_SENDING_STDIN:
- if (*p->in_loaded) {
- PARA_INFO_LOG("loaded: %d\n", *p->in_loaded);
- para_fd_set(p->fd, &s->wfds, &s->max_fileno);
- p->check_w = 1;
- } else {
- if (*p->in_eof) {
- t->ret = -E_INPUT_EOF;
- s->timeout.tv_sec = 0;
- s->timeout.tv_usec = 1;
- }
- }
- return;
- }
+static void complete_addblob(__a_unused const char *blob_type,
+ __a_unused struct i9e_completion_info *ci,
+ __a_unused struct i9e_completion_result *cr)
+{
+ cr->filename_completion_desired = true;
}
-static ssize_t client_recv_buffer(struct private_client_data *p)
+static void generic_blob_complete(const char *blob_type,
+ struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
{
- ssize_t ret = recv_buffer(p->fd, p->buf + p->loaded,
- CLIENT_BUFSIZE - p->loaded);
- if (!ret)
- return -E_SERVER_EOF;
- if (ret > 0)
- p->loaded += ret;
- return ret;
+ char cmd[20];
+ sprintf(cmd, "ls%s", blob_type);
+ extract_matches_from_command(ci->word, cmd, &cr->matches);
+}
+static void complete_catblob(const char *blob_type,
+ struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ generic_blob_complete(blob_type, ci, cr);
}
-static void client_post_select(struct sched *s, struct task *t)
+static void complete_lsblob(const char *blob_type,
+ struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
{
- struct private_client_data *p = t->private_data;
+ char *opts[] = {"-i", "-l", "-r", NULL};
- PARA_INFO_LOG("status %d\n", p->status);
- t->ret = 1;
- if (p->fd < 0)
- return;
- if (!p->check_r && !p->check_w)
- return;
- if (p->check_r && !FD_ISSET(p->fd, &s->rfds))
- return;
- if (p->check_w && !FD_ISSET(p->fd, &s->wfds))
- return;
- switch (p->status) {
- case CL_CONNECTED: /* receive welcome message */
- t->ret = client_recv_buffer(p);
- if (t->ret > 0)
- p->status = CL_RECEIVED_WELCOME;
- return;
- case CL_RECEIVED_WELCOME: /* send auth command */
- sprintf(p->buf, "auth %s%s", p->conf.plain_given?
- "" : "rc4 ", p->user);
- PARA_INFO_LOG("--> %s\n", p->buf);
- t->ret = send_buffer(p->fd, p->buf);
- if (t->ret >= 0)
- p->status = CL_SENT_AUTH;
+ if (ci->word[0] == '-')
+ return i9e_complete_option(opts, ci, cr);
+ generic_blob_complete(blob_type, ci, cr);
+}
+
+static void complete_rmblob(const char *blob_type,
+ struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ generic_blob_complete(blob_type, ci, cr);
+}
+
+static void complete_mvblob(const char *blob_type,
+ struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ generic_blob_complete(blob_type, ci, cr);
+}
+
+/* these don't need any completions */
+I9E_DUMMY_COMPLETER(ff);
+I9E_DUMMY_COMPLETER(hup);
+I9E_DUMMY_COMPLETER(jmp);
+I9E_DUMMY_COMPLETER(next);
+I9E_DUMMY_COMPLETER(nomore);
+I9E_DUMMY_COMPLETER(pause);
+I9E_DUMMY_COMPLETER(play);
+I9E_DUMMY_COMPLETER(si);
+I9E_DUMMY_COMPLETER(term);
+I9E_DUMMY_COMPLETER(version);
+I9E_DUMMY_COMPLETER(stop);
+I9E_DUMMY_COMPLETER(addatt);
+I9E_DUMMY_COMPLETER(init);
+
+static struct i9e_completer completers[];
+
+static void help_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *result)
+{
+ result->matches = i9e_complete_commands(ci->word, completers);
+}
+
+static void stat_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *opts[] = {"-n=", "-p", NULL};
+ //PARA_CRIT_LOG("word: %s\n", ci->word);
+ i9e_complete_option(opts, ci, cr);
+}
+
+static void sender_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *senders[] = {"http", "dccp", "udp", NULL};
+ char *http_cmds[] = {"on", "off", "allow", "deny", "help", NULL};
+ char *dccp_cmds[] = {"on", "off", "allow", "deny", "help", NULL};
+ char *udp_cmds[] ={"on", "off", "add", "delete", "help", NULL};
+ char *sender;
+ char **cmds;
+
+ //PARA_CRIT_LOG("wn: %d\n", ci->word_num);
+ if (ci->word_num == 0 || ci->word_num > 3)
return;
- case CL_SENT_AUTH: /* receive challenge number */
- p->loaded = 0;
- t->ret = client_recv_buffer(p);
- if (t->ret < 0)
- return;
- if (t->ret != 64) {
- t->ret = -E_INVALID_CHALLENGE;
- PARA_ERROR_LOG("received the following: %s\n", p->buf);
- return;
- }
- PARA_INFO_LOG("%s", "<-- [challenge]\n");
- /* decrypt challenge number */
- t->ret = para_decrypt_challenge(p->key_file, &p->challenge_nr,
- (unsigned char *) p->buf, 64);
- if (t->ret > 0)
- p->status = CL_RECEIVED_CHALLENGE;
+ if (ci->word_num == 1 || (ci->word_num == 2 && *ci->word != '\0')) {
+ i9e_extract_completions(ci->word, senders, &cr->matches);
return;
- case CL_RECEIVED_CHALLENGE: /* send decrypted challenge */
- PARA_INFO_LOG("--> %lu\n", p->challenge_nr);
- t->ret = send_va_buffer(p->fd, "%s%lu", CHALLENGE_RESPONSE_MSG,
- p->challenge_nr);
- if (t->ret > 0)
- p->status = CL_SENT_CH_RESPONSE;
+ }
+ sender = ci->argv[1];
+ //PARA_CRIT_LOG("sender: %s\n", sender);
+ if (strcmp(sender, "http") == 0)
+ cmds = http_cmds;
+ else if (strcmp(sender, "dccp") == 0)
+ cmds = dccp_cmds;
+ else if (strcmp(sender, "udp") == 0)
+ cmds = udp_cmds;
+ else
return;
- case CL_SENT_CH_RESPONSE: /* read server response */
- {
- size_t bytes_received;
- unsigned char rc4_buf[2 * RC4_KEY_LEN] = "";
- p->loaded = 0;
- t->ret = client_recv_buffer(p);
- if (t->ret < 0)
- return;
- bytes_received = t->ret;
- PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server "
- "info ++++\n", p->buf);
- /* check if server has sent "Proceed" message */
- t->ret = -E_CLIENT_AUTH;
- if (!strstr(p->buf, PROCEED_MSG))
- return;
- t->ret = 1;
- p->status = CL_RECEIVED_PROCEED;
- if (bytes_received < PROCEED_MSG_LEN + 32)
- return;
- PARA_INFO_LOG("%s", "decrypting session key\n");
- t->ret = para_decrypt_buffer(p->key_file, rc4_buf,
- (unsigned char *)p->buf + PROCEED_MSG_LEN + 1,
- bytes_received - PROCEED_MSG_LEN - 1);
- if (t->ret < 0)
- return;
- RC4_set_key(&p->rc4_send_key, RC4_KEY_LEN, rc4_buf);
- RC4_set_key(&p->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
- enable_crypt(p->fd, rc4_recv, rc4_send);
- }
- case CL_RECEIVED_PROCEED: /* concat args and send command */
- {
- int i;
- char *command = NULL;
- for (i = 0; i < p->conf.inputs_num; i++) {
- char *tmp = command;
- command = make_message("%s\n%s", command?
- command : "", p->conf.inputs[i]);
- free(tmp);
- }
- command = para_strcat(command, EOC_MSG "\n");
- PARA_INFO_LOG("--> %s\n", command);
- t->ret = send_buffer(p->fd, command);
- free(command);
- if (t->ret > 0)
- p->status = CL_SENT_COMMAND;
+ i9e_extract_completions(ci->word, cmds, &cr->matches);
+}
+
+static void add_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *opts[] = {"-a", "-l", "-f", "-v", "--", NULL};
+
+ if (ci->word[0] == '-')
+ i9e_complete_option(opts, ci, cr);
+ cr->filename_completion_desired = true;
+}
+
+static void ls_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *opts[] = {
+ "--", "-l", "-ls", "-ll", "-lv", "-lp", "-lm", "-lc", "-p",
+ "-a", "-r", "-d", "-sp", "-sl", "-ss", "-sn", "-sf", "-sc",
+ "-si", "-sy", "-sb", "-sd", "-sa", NULL
+ };
+ if (ci->word[0] == '-')
+ i9e_complete_option(opts, ci, cr);
+ cr->filename_completion_desired = true;
+}
+
+static void setatt_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *buf, **sl;
+ int i, ret, num_atts;
+
+ if (ci->word_num == 0)
return;
- }
- case CL_SENT_COMMAND:
- p->loaded = 0;
- t->ret = client_recv_buffer(p);
- p->loaded = 0;
- if (t->ret < 0)
- return;
- t->ret = -E_HANDSHAKE_COMPLETE;
- if (strstr(p->buf, AWAITING_DATA_MSG))
- p->status = CL_SENDING_STDIN;
- else
- p->status = CL_RECEIVING_SERVER_OUTPUT;
+
+ if (*ci->word == '/' || *ci->word == '\0')
+ cr->filename_completion_desired = true;
+ if (*ci->word == '/')
return;
- case CL_SENDING_STDIN: /* FIXME: might block */
- PARA_INFO_LOG("loaded: %d\n", *p->in_loaded);
- t->ret = send_bin_buffer(p->fd, p->inbuf, *p->in_loaded);
- if (t->ret <= 0) {
- if (!t->ret)
- t->ret = 1;
- return;
- }
- *p->in_loaded = 0; /* FIXME: short writes */
+ ret = execute_client_command("lsatt", &buf);
+ if (ret < 0)
return;
- case CL_RECEIVING_SERVER_OUTPUT:
- t->ret = client_recv_buffer(p);
+ ret = create_argv(buf, "\n", &sl);
+ if (ret < 0)
+ goto out;
+ num_atts = ret;
+ sl = para_realloc(sl, (2 * num_atts + 1) * sizeof(char *));
+ for (i = 0; i < num_atts; i++) {
+ char *orig = sl[i];
+ sl[i] = make_message("%s+", orig);
+ sl[num_atts + i] = make_message("%s-", orig);
+ free(orig);
+ }
+ sl[2 * num_atts] = NULL;
+ ret = i9e_extract_completions(ci->word, sl, &cr->matches);
+out:
+ free(buf);
+ free_argv(sl);
+}
+
+static void lsatt_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *opts[] = {"-i", "-l", "-r", NULL};
+
+ if (ci->word[0] == '-')
+ i9e_complete_option(opts, ci, cr);
+ else
+ complete_attributes(ci->word, &cr->matches);
+}
+
+static void mvatt_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ complete_attributes(ci->word, &cr->matches);
+}
+
+static void rmatt_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ complete_attributes(ci->word, &cr->matches);
+}
+
+static void check_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *opts[] = {"-a", "-m", "-p", NULL};
+ i9e_complete_option(opts, ci, cr);
+}
+
+static void rm_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *opts[] = {"-v", "-f", "-p", NULL};
+
+ if (ci->word[0] == '-') {
+ i9e_complete_option(opts, ci, cr);
return;
}
+ cr->filename_completion_desired = true;
+}
+
+static void touch_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *opts[] = {"-n=", "-l=", "-y=", "-i=", "-a=", "-v", "-p", NULL};
+
+ if (ci->word[0] == '-')
+ i9e_complete_option(opts, ci, cr);
+ cr->filename_completion_desired = true;
+}
+
+static void cpsi_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *opts[] = {"-a", "-y", "-i", "-l", "-n", "-v", NULL};
+
+ if (ci->word[0] == '-')
+ i9e_complete_option(opts, ci, cr);
+ cr->filename_completion_desired = true;
+}
+
+static void select_completer(struct i9e_completion_info *ci,
+ struct i9e_completion_result *cr)
+{
+ char *mood_buf, *pl_buf, **moods, **playlists, **mops;
+ int num_moods, num_pl, i, n, ret;
+
+ ret = execute_client_command("lsmood", &mood_buf);
+ if (ret < 0)
+ return;
+ ret = execute_client_command("lspl", &pl_buf);
+ if (ret < 0)
+ goto free_mood_buf;
+ ret = create_argv(mood_buf, "\n", &moods);
+ if (ret < 0)
+ goto free_pl_buf;
+ num_moods = ret;
+ ret = create_argv(pl_buf, "\n", &playlists);
+ if (ret < 0)
+ goto free_moods;
+ num_pl = ret;
+ n = num_moods + num_pl;
+ mops = para_malloc((n + 1) * sizeof(char *));
+ for (i = 0; i < num_moods; i++)
+ mops[i] = make_message("m/%s", moods[i]);
+ for (i = 0; i < num_pl; i++)
+ mops[num_moods + i] = make_message("p/%s", playlists[i]);
+ mops[n] = NULL;
+ i9e_extract_completions(ci->word, mops, &cr->matches);
+ free_argv(mops);
+ free_argv(playlists);
+free_moods:
+ free_argv(moods);
+free_pl_buf:
+ free(pl_buf);
+free_mood_buf:
+ free(mood_buf);
}
-static int client_open(struct private_client_data *pcd)
+
+#define DEFINE_BLOB_COMPLETER(cmd, blob_type) \
+ static void cmd ## blob_type ## _completer( \
+ struct i9e_completion_info *ci, \
+ struct i9e_completion_result *cr) \
+ {complete_ ## cmd ## blob(#blob_type, ci, cr);}
+
+DEFINE_BLOB_COMPLETER(add, mood)
+DEFINE_BLOB_COMPLETER(add, lyr)
+DEFINE_BLOB_COMPLETER(add, img)
+DEFINE_BLOB_COMPLETER(add, pl)
+DEFINE_BLOB_COMPLETER(cat, mood)
+DEFINE_BLOB_COMPLETER(cat, lyr)
+DEFINE_BLOB_COMPLETER(cat, img)
+DEFINE_BLOB_COMPLETER(cat, pl)
+DEFINE_BLOB_COMPLETER(ls, mood)
+DEFINE_BLOB_COMPLETER(ls, lyr)
+DEFINE_BLOB_COMPLETER(ls, img)
+DEFINE_BLOB_COMPLETER(ls, pl)
+DEFINE_BLOB_COMPLETER(rm, mood)
+DEFINE_BLOB_COMPLETER(rm, lyr)
+DEFINE_BLOB_COMPLETER(rm, img)
+DEFINE_BLOB_COMPLETER(rm, pl)
+DEFINE_BLOB_COMPLETER(mv, mood)
+DEFINE_BLOB_COMPLETER(mv, lyr)
+DEFINE_BLOB_COMPLETER(mv, img)
+DEFINE_BLOB_COMPLETER(mv, pl)
+
+static int client_i9e_line_handler(char *line)
{
int ret;
- struct hostent *he;
- struct sockaddr_in their_addr;
- /* get the host info */
- PARA_NOTICE_LOG("getting host info of %s\n",
- pcd->conf.hostname_arg);
- ret = get_host_info(pcd->conf.hostname_arg, &he);
+ client_disconnect(ct);
+ if (!line || !*line)
+ return 0;
+ PARA_DEBUG_LOG("line handler: %s\n", line);
+ ret = make_client_argv(line);
if (ret < 0)
- goto out;
- /* get new socket */
- ret = get_socket();
+ return ret;
+ ret = client_connect(ct, &sched, NULL, NULL);
if (ret < 0)
- goto out;
- pcd->fd = ret;
- /* init their_addr */
- init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
- /* connect */
- PARA_NOTICE_LOG("connecting to %s\n", pcd->conf.hostname_arg);
- ret = para_connect(pcd->fd, &their_addr);
+ return ret;
+ i9e_attach_to_stdout(ct->btrn);
+ return 1;
+}
+
+static void client_sighandler(int s)
+{
+ i9e_signal_dispatch(s);
+}
+
+static struct i9e_completer completers[] = {
+ SERVER_COMPLETERS
+ AFS_COMPLETERS
+ {.name = NULL}
+};
+
+__noreturn static void interactive_session(void)
+{
+ int ret;
+ char *history_file;
+ struct sigaction act;
+ struct i9e_client_info ici = {
+ .fds = {0, 1, 2},
+ .prompt = "para_client> ",
+ .line_handler = client_i9e_line_handler,
+ .loglevel = client_loglevel,
+ .completers = completers,
+ };
+
+ PARA_NOTICE_LOG("\n%s\n", VERSION_TEXT("client"));
+ if (ct->conf.history_file_given)
+ history_file = para_strdup(ct->conf.history_file_arg);
+ else {
+ char *home = para_homedir();
+ history_file = make_message("%s/.paraslash/client.history",
+ home);
+ free(home);
+ }
+ ici.history_file = history_file;
+
+ act.sa_handler = client_sighandler;
+ sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+ sigaction(SIGINT, &act, NULL);
+ sched.select_function = i9e_select;
+
+ ret = i9e_open(&ici, &sched);
if (ret < 0)
goto out;
- pcd->status = CL_CONNECTED;
- pcd->task.pre_select = client_pre_select;
- pcd->task.post_select = client_post_select;
- pcd->task.private_data = pcd;
- sprintf(pcd->task.status, "client");
- register_task(&pcd->task);
- ret = 1;
+ para_log = i9e_log;
+ ret = schedule(&sched);
+ i9e_close();
+ para_log = stderr_log;
out:
- return ret;
+ if (ret < 0)
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
+ //client_close(ct);
+}
+
+__noreturn static void print_completions(void)
+{
+ int ret = i9e_print_completions(completers);
+ exit(ret <= 0? EXIT_FAILURE : EXIT_SUCCESS);
}
-static void client_event_handler(struct task *t)
+#else /* HAVE_READLINE */
+
+__noreturn static void interactive_session(void)
{
- struct private_client_data *p = t->private_data;
+ PARA_EMERG_LOG("interactive sessions not available\n");
+ exit(EXIT_FAILURE);
+}
+
+__noreturn static void print_completions(void)
+{
+ PARA_EMERG_LOG("command completion not available\n");
+ exit(EXIT_FAILURE);
+}
- PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
- if (t->ret != -E_HANDSHAKE_COMPLETE) {
- unregister_task(t);
- p->eof = 1;
+#endif /* HAVE_READLINE */
+
+static void supervisor_post_select(struct sched *s, struct task *t)
+{
+ if (ct->task.error < 0) {
+ t->error = ct->task.error;
return;
}
- if (p->status == CL_SENDING_STDIN) {
+ 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;
+ register_task(s, &sit.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);
+ if (ct->status == CL_RECEIVING) {
+ stdout_set_defaults(&sot);
+ register_task(s, &sot.task);
+ t->error = -E_TASK_STARTED; return;
+ }
}
-/*
- * MAIN
+static struct task svt = {
+ .post_select = supervisor_post_select,
+ .status = "supervisor task"
+};
+
+/**
+ * The client program to connect to para_server.
+ *
+ * \param argc Usual argument count.
+ * \param argv Usual argument vector.
+ *
+ * When called without a paraslash command, an interactive session is started.
+ * Otherwise, the client task and the supervisor task are started. The former
+ * communicates with para_server while the latter monitors 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(), stdin.c, stdout.c, para_client(1), para_server(1)
*/
int main(int argc, char *argv[])
{
-
int ret;
- struct sched s;
- init_sched();
- s.default_timeout.tv_sec = 1;
- s.default_timeout.tv_usec = 0;
- ret = client_parse_config(argc, argv, &pcd);
+ init_random_seed_or_die();
+ sched.default_timeout.tv_sec = 1;
+
+ ret = client_parse_config(argc, argv, &ct, &client_loglevel);
if (ret < 0)
goto out;
- pcd->task.event_handler = client_event_handler;
- ret = client_open(pcd);
+ if (ct->conf.complete_given)
+ print_completions();
+ if (ret == 0)
+ interactive_session(); /* does not return */
+
+ /*
+ * 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, &sched);
if (ret < 0)
goto out;
- ret = sched(&s);
- client_close(pcd);
+ sot.btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "stdout", .parent = ct->btrn));
+ register_task(&sched, &svt);
+ ret = schedule(&sched);
out:
- if (ret < 0)
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
- return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
+ 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