X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=ec32cd414e31df10dd5c7dbecbdef60c5134a5a2;hp=3fc673e7c6386238b4cada69e2ca2dff3df4c357;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=3a343b3f6bdf852848b2eb9b7d2f4f3661aa78cd diff --git a/client.c b/client.c index 3fc673e7..ec32cd41 100644 --- a/client.c +++ b/client.c @@ -1,322 +1,110 @@ /* - * Copyright (C) 1997-2006 Andre Noll + * Copyright (C) 1997-2011 Andre Noll * - * 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 +#include +#include + #include "para.h" -#include "config.h" -#include "client.cmdline.h" +#include "list.h" +#include "sched.h" #include "crypt.h" -#include "rc4.h" -#include -#include "net.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_SENT_AUTH, CL_RECEIVED_CHALLENGE, CL_SENT_CH_RESPONSE, - CL_RECEIVED_PROCEED, CL_SENT_COMMAND, CL_SENDING_STDIN, CL_RECV_DATA}; - -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; - - char *in_buf; - size_t *in_loaded; - char *out_buf; - size_t *out_loaded; -}; - INIT_CLIENT_ERRLISTS; -static struct private_client_data *pcd; +static struct client_task *ct; +static struct stdin_task sit; +static struct stdout_task sot; -static void rc4_send(unsigned long len, const unsigned char *indata, - unsigned char *outdata) +static void supervisor_post_select(__a_unused struct sched *s, struct task *t) { - RC4(&pcd->rc4_send_key, len, indata, outdata); -} - -static void rc4_recv(unsigned long len, const unsigned char *indata, - unsigned char *outdata) -{ - RC4(&pcd->rc4_recv_key, len, indata, outdata); -} - - -/* - * client log function - */ -void para_log(int ll, const char* fmt,...) -{ - va_list argp; - - /* ignore log message if loglevel is not high enough */ - if (pcd && ll < pcd->conf.loglevel_arg) + if (ct->task.error < 0) { + t->error = ct->task.error; return; - va_start(argp, fmt); - vfprintf(stderr, fmt, argp); - va_end(argp); -} - -static void client_close(struct private_client_data *pcd) -{ - if (pcd) + } + if (ct->status == CL_SENDING) { + stdin_set_defaults(&sit); + register_task(&sit.task); + t->error = -E_TASK_STARTED; return; - if (pcd->fd >= 0) - close(pcd->fd); - free(pcd->user); - free(pcd->config_file); - free(pcd->key_file); - free(pcd); -} - -static void append_str(char **data, const char* append) -{ - if (*data) { - char *tmp = make_message("%s\n%s", *data, append); - free(*data); - *data = tmp; - } else - *data = para_strdup(append); -} - -static int client_parse_config(int argc, char *argv[], - struct private_client_data **pcd_ptr) -{ - 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) - 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; - goto out; } - if (!ret) - cmdline_parser_configfile(p->config_file, &p->conf, 0, 0, 0); - ret = 1; -out: - free(home); - if (ret < 0) - client_close(p); - else - *pcd_ptr = p; - return ret; -} - -static int send_stdin(int fd) -{ - char buf[8192]; - int ret; - - PARA_NOTICE_LOG("%s", "sending stdin\n"); - for (;;) { - ret = read(STDIN_FILENO, buf, sizeof(buf)); - if (ret <= 0) - return ret; - ret = send_bin_buffer(fd, buf, ret); - if (ret < 0) - return ret; + if (ct->status == CL_RECEIVING) { + stdout_set_defaults(&sot); + register_task(&sot.task); + t->error = -E_TASK_STARTED; + return; } - return 1; } -static int client_open(struct private_client_data *pcd) -{ - 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); - if (ret < 0) - goto out; - /* get new socket */ - ret = get_socket(); - 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); - if (ret < 0) - goto out; - ret = 1; -out: - return ret; -} +static struct task svt = { + .post_select = supervisor_post_select, + .status = "supervisor task" +}; +static int client_loglevel = LL_ERROR; /* loglevel */ +INIT_STDERR_LOGGING(client_loglevel); -/* - * MAIN +/** + * The client program to connect to para_server. + * + * \param argc Usual argument count. + * \param argv Usual argument vector. + * + * It registers two tasks: The client task that communicates with para_server + * 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(), stdin.c, stdout.c, para_client(1), para_server(1) */ int main(int argc, char *argv[]) { - int numbytes, i, received, ret; - struct hostent *he; - struct sockaddr_in their_addr; - char *command = NULL; - char buf[8192]; - char *auth_str; - long unsigned challenge_nr; - unsigned char rc4_buf[2 * RC4_KEY_LEN] = ""; - - ret = client_parse_config(argc, argv, &pcd); - if (ret < 0) - goto out; - if (pcd->conf.loglevel_arg <= NOTICE) - cmdline_parser_print_version(); - PARA_INFO_LOG( - "current loglevel: %d\n" - "using config_file: %s\n" - "using key_file: %s\n" - "connecting to %s:%d\n", - pcd->conf.loglevel_arg, - pcd->config_file, - pcd->key_file, - pcd->conf.hostname_arg, - pcd->conf.server_port_arg - ); - ret = client_open(pcd); - if (ret < 0) - goto out; - /* receive welcome message */ - ret = recv_buffer(pcd->fd, buf, sizeof(buf)); - if (ret < 0) - goto out; - /* send auth command */ - auth_str = make_message("auth %s%s", pcd->conf.plain_given? "" : "rc4 ", - pcd->user); - PARA_INFO_LOG("<-- %s--> %s\n", buf, auth_str); - ret = send_buffer(pcd->fd, auth_str); - if (ret < 0) - goto out; - /* receive challenge number */ - ret = recv_buffer(pcd->fd, buf, sizeof(buf)); - if (ret < 0) - goto out; - if (ret != 64) { - ret = -E_INVALID_CHALLENGE; - PARA_ERROR_LOG("received the following: %s\n", buf); - goto out; - } - PARA_INFO_LOG("%s", "<-- [challenge]\n"); - /* decrypt challenge number */ - ret = para_decrypt_challenge(pcd->key_file, &challenge_nr, - (unsigned char *) buf, 64); - if (ret < 0) - goto out; - /* send decrypted challenge */ - PARA_INFO_LOG("--> %lu\n", challenge_nr); - ret = send_va_buffer(pcd->fd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr); - if (ret < 0) - goto out; - /* wait for approval */ - PARA_NOTICE_LOG("%s", "waiting for approval from server\n"); - ret = recv_buffer(pcd->fd, buf, sizeof(buf)); - if (ret < 0) - goto out; - numbytes = ret; - PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server " - "info ++++\n", buf); - /* check if server has sent "Proceed" message */ - ret = -E_CLIENT_AUTH; - if (!strstr(buf, PROCEED_MSG)) - goto out; - if (numbytes >= PROCEED_MSG_LEN + 32) { - PARA_INFO_LOG("%s", "decrypting session key\n"); - ret = para_decrypt_buffer(pcd->key_file, rc4_buf, - (unsigned char *)buf + PROCEED_MSG_LEN + 1, - numbytes - PROCEED_MSG_LEN - 1); - if (ret < 0) - goto out; - RC4_set_key(&pcd->rc4_send_key, RC4_KEY_LEN, rc4_buf); - RC4_set_key(&pcd->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN); - PARA_INFO_LOG("rc4 encryption activated: %x:%x:%x:%x\n", - rc4_buf[0], rc4_buf[1], rc4_buf[2], rc4_buf[3]); - enable_crypt(pcd->fd, rc4_recv, rc4_send); - } - /* concat args */ - for (i = 0; i < pcd->conf.inputs_num; i++) - append_str(&command, pcd->conf.inputs[i]); - /* send command */ - PARA_INFO_LOG("--> %s\n", command); - ret = send_buffer(pcd->fd, command); - if (ret < 0) - goto out; - free(command); - command = NULL; - ret = send_buffer(pcd->fd, EOC_MSG "\n"); + int ret; + static struct sched s; + + init_random_seed_or_die(); + s.default_timeout.tv_sec = 1; + s.default_timeout.tv_usec = 0; + /* + * 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) goto out; - PARA_NOTICE_LOG("%s", "command sent.\n"); - received = 0; - for (;;) { - ret = recv_bin_buffer(pcd->fd, buf, sizeof(buf) - 1); - if (ret <= 0) { - if (!ret) - PARA_NOTICE_LOG("%s", "connection closed by peer\n"); - goto out; - } - buf[ret] = '\0'; - numbytes = ret; - if (!received && strstr(buf, AWAITING_DATA_MSG)) { - ret = send_stdin(pcd->fd); - goto out; - } - received = 1; - ret = write(STDOUT_FILENO, buf, numbytes); - if (ret != numbytes) { - ret = -E_SHORT_CLIENT_WRITE; - goto out; - } - } - client_close(pcd); + sot.btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdout", .parent = ct->btrn)); + register_task(&svt); + ret = schedule(&s); 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; }