X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=ec32cd414e31df10dd5c7dbecbdef60c5134a5a2;hp=1ece195036b55a51538884f3af7539215c36b714;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623 diff --git a/client.c b/client.c index 1ece1950..ec32cd41 100644 --- a/client.c +++ b/client.c @@ -1,318 +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 -#include -#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" -/* A static variable for holding the line. */ -static char *line_read; +INIT_CLIENT_ERRLISTS; -struct gengetopt_args_info args_info; +static struct client_task *ct; +static struct stdin_task sit; +static struct stdout_task sot; -/* - * client log function - */ -void para_log(int ll, char* fmt,...) +static void supervisor_post_select(__a_unused struct sched *s, struct task *t) { - va_list argp; - FILE *outfd; - - /* ignore log message if loglevel is not high enough */ - if (ll < args_info.loglevel_arg) + if (ct->task.error < 0) { + t->error = ct->task.error; return; - if (ll < WARNING) - outfd = stdout; - else - outfd = stderr; - va_start(argp, fmt); - vfprintf(stdout, fmt, argp); - va_end(argp); -} - -/* - * Read a string, and return a pointer to it. Returns NULL on EOF. - */ -static char *rl_gets(void) -{ - free(line_read); - /* Get a line from the user. */ - line_read = readline("para_client> "); - /* If the line has any text in it, save it on the history. */ - if (line_read && *line_read) - add_history(line_read); - return line_read; -} - -/* - * do several cleanups on sigint - */ -static void sigint_handler(__unused int i) -{ - rl_cleanup_after_signal(); - rl_reset_after_signal(); -} - -void get_options(int argc, char *argv[], - char **config_file, char **key_file) -{ - char *home; - static char default_key_file[_POSIX_PATH_MAX] = ""; - static char default_config_file[_POSIX_PATH_MAX] = ""; - struct stat statbuf; - int ret; - - cmdline_parser(argc, argv, &args_info); - if (!args_info.user_given) - args_info.user_arg = para_logname(); - if (!args_info.key_file_given) { - home = para_homedir(); - sprintf(default_key_file, "%s/.paraslash/key.%s", home, - args_info.user_arg); - free(home); } - if (!args_info.config_file_given) { - home = para_homedir(); - sprintf(default_config_file, "%s/.paraslash/client.conf", - home); - free(home); + if (ct->status == CL_SENDING) { + stdin_set_defaults(&sit); + register_task(&sit.task); + t->error = -E_TASK_STARTED; + return; } - if (!args_info.config_file_given) - *config_file = default_config_file; - else - *config_file = args_info.config_file_arg; - ret = stat(*config_file, &statbuf); - if (ret && args_info.config_file_given) { - fprintf(stderr, "can not stat config file %s\n", - args_info.config_file_arg); - exit(EXIT_FAILURE); + if (ct->status == CL_RECEIVING) { + stdout_set_defaults(&sot); + register_task(&sot.task); + t->error = -E_TASK_STARTED; + return; } - if (!ret) - cmdline_parser_configfile(*config_file, &args_info, 0, 0, 0); - if (!args_info.key_file_given) - *key_file = default_key_file; - else - *key_file = args_info.key_file_arg; } -static RC4_KEY rc4_recv_key; -static RC4_KEY rc4_send_key; -static unsigned char rc4_buf[2 * RC4_KEY_LEN]; - -static void rc4_send(unsigned long len, const unsigned char *indata, unsigned char *outdata) -{ - RC4(&rc4_send_key, len, indata, outdata); -} - -static void rc4_recv(unsigned long len, const unsigned char *indata, unsigned char *outdata) -{ - RC4(&rc4_recv_key, len, indata, outdata); -} -void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata); -void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata); +static struct task svt = { + .post_select = supervisor_post_select, + .status = "supervisor task" +}; +static int client_loglevel = LL_ERROR; /* loglevel */ +INIT_STDERR_LOGGING(client_loglevel); -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); -} - -/* - * 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 sockfd, numbytes, i, interactive, received, ret; - struct hostent *he; - struct sockaddr_in their_addr; - char *command = NULL; - char buf[8192]; - char *auth_str; - char *key_file, *config_file; - long unsigned challenge_nr; - char *line; - - get_options(argc, argv, &config_file, &key_file); - if (args_info.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", - args_info.loglevel_arg, - config_file, - key_file, - args_info.hostname_arg, - args_info.server_port_arg - ); - interactive = args_info.inputs_num == 0? 1 : 0; - if (interactive) { - PARA_NOTICE_LOG("%s", "no command, entering interactive mode\n"); - signal(SIGINT, sigint_handler); - } else { - /* not interactive, concat args */ - for (i = 0; i < args_info.inputs_num; i++) - append_str(&command, args_info.inputs[i]); - } -interactive_loop: - crypt_function_recv = NULL; - crypt_function_send = NULL; - if (interactive) { - int i = 0; - char *p; - - rl_save_prompt(); - rl_message("\n"); - rl_kill_full_line(0, 0); - rl_free_line_state(); - /* read a line via readline */ - line = rl_gets(); - if (!line) - return 0; - if (!line[0]) - goto interactive_loop; - p = line; - while (sscanf(p, "%200s%n", buf, &i) == 1) { - append_str(&command, buf); - p += i; - } - } - /* get the host info */ - PARA_NOTICE_LOG("getting host info of %s\n", - args_info.hostname_arg); - if (!(he = get_host_info(args_info.hostname_arg))) - exit(EXIT_FAILURE); - /* get new socket */ - if ((sockfd = get_socket()) < 0) - exit(EXIT_FAILURE); - /* init their_addr */ - init_sockaddr(&their_addr, args_info.server_port_arg, he); - /* Connect */ - PARA_NOTICE_LOG("connecting to %s...\n", - args_info.hostname_arg); - if (para_connect(sockfd, &their_addr) < 0) - exit(EXIT_FAILURE); - /* Receive Welcome message */ - if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0) - exit(EXIT_FAILURE); - /* send auth command */ - auth_str = make_message("auth %s%s", args_info.plain_given? "" : "rc4 ", - args_info.user_arg); - PARA_INFO_LOG("<-- %s--> %s\n", buf, auth_str); - if (send_buffer(sockfd, auth_str) < 0) - exit(EXIT_FAILURE); - /* receive challenge number */ - if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0) - exit(EXIT_FAILURE); - if (numbytes != 64) { - PARA_EMERG_LOG("did not receive valid challenge (got %i bytes)\n", - numbytes); - buf[numbytes] = '\0'; - PARA_ERROR_LOG("received the following instead: %s\n", buf); - goto write_out; - } - PARA_INFO_LOG("<-- [challenge (%i bytes)]\n", numbytes); - /* decrypt challenge number */ - ret = para_decrypt_challenge(key_file, &challenge_nr, (unsigned char *) buf, - numbytes); + 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; + 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) { - PARA_EMERG_LOG("decrypt error (%d). Bad secret key?\n", ret); - exit(EXIT_FAILURE); - } - /* send decrypted challenge */ - PARA_INFO_LOG("--> %lu\n", challenge_nr); - if (send_va_buffer(sockfd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr) < 0) - exit(EXIT_FAILURE); - /* Wait for approval */ - PARA_NOTICE_LOG("%s", "waiting for approval from server\n"); - if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0) - exit(EXIT_FAILURE); - PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server " - "info ++++\n", buf); - /* Check if server has sent "Proceed" message */ - if (!strstr(buf, PROCEED_MSG)) { - PARA_EMERG_LOG("%s", "authentication failed\n"); - exit(EXIT_FAILURE); - } - if (numbytes >= PROCEED_MSG_LEN + 32) { - PARA_INFO_LOG("%s", "decrypting session key\n"); - if (para_decrypt_buffer(key_file, rc4_buf, - (unsigned char *)buf + PROCEED_MSG_LEN + 1, - numbytes - PROCEED_MSG_LEN - 1) < 0) { - PARA_EMERG_LOG("%s", "error receiving rc4 key\n"); - exit(EXIT_FAILURE); - } - RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf); - RC4_set_key(&rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN); - PARA_INFO_LOG("rc4 encrytion activated: %x:%x:%x:%x\n", - rc4_buf[0], rc4_buf[1], rc4_buf[2], rc4_buf[3]); - crypt_function_recv = rc4_recv; - crypt_function_send = rc4_send; - } - /* send command */ - PARA_INFO_LOG("--> %s\n", command); - if (send_buffer(sockfd, command) < 0) - exit(EXIT_FAILURE); - free(command); - command = NULL; - if (send_buffer(sockfd, EOC_MSG "\n") < 0) - exit(EXIT_FAILURE); - PARA_NOTICE_LOG("%s", "command sent.\n"); -write_out: - received = 0; - /* write server output to stdout */ - while ((numbytes = recv_bin_buffer(sockfd, buf, sizeof(buf))) > 0) { - int ret; - - if (!received && strstr(buf, AWAITING_DATA_MSG)) { - PARA_NOTICE_LOG("%s", "<-- awaiting data\n"); - PARA_NOTICE_LOG("%s", "--> sending stdin\n"); - while ((ret = read(STDIN_FILENO, buf, - sizeof(buf))) > 0) - send_bin_buffer(sockfd, buf, ret); - PARA_NOTICE_LOG("%s", "closing connection\n"); - numbytes = 1; - break; - } - received = 1; - if (write(STDOUT_FILENO, buf, numbytes) != numbytes) - break; + /* can not use PARA_LOG here because ct is NULL */ + fprintf(stderr, "%s\n", para_strerror(-ret)); + return EXIT_FAILURE; } - if (!numbytes) - PARA_NOTICE_LOG("%s", "connection closed by peer\n"); - close(sockfd); - if (interactive) - goto interactive_loop; - return 0; + return EXIT_SUCCESS; }