X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=1b53f705423556040736a4e70dbd8fc7460a38f2;hp=a0128ad9b4508835caf4d11478b2e340b73118df;hb=6ce1f648d6e34e49472ce938c83e5bf8e65cd429;hpb=27638103f249ffbe9768603b9baff199950fd9f6 diff --git a/client_common.c b/client_common.c index a0128ad9..1b53f705 100644 --- a/client_common.c +++ b/client_common.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 1997-2006 Andre Noll + * Copyright (C) 1997-2007 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_common.c common functions of para_client and para_audiod */ @@ -27,38 +15,115 @@ #include "net.h" #include "fd.h" #include "string.h" +#include "client.cmdline.h" #include "client.h" #include "error.h" -void rc4_send(unsigned long len, const unsigned char *indata, +/* + * rc4 encrypt data before sending + * + * \param len the number of bytes to encrypt + * \param indata pointer to the input data of length \a len to be encrypted + * \param outdata pointer that holds the encrypted data after return + * \param private_data pointer to the private client data containing + * the rc4 key + * */ +static void rc4_send(unsigned long len, const unsigned char *indata, unsigned char *outdata, void *private_data) { struct private_client_data *pcd = private_data; RC4(&pcd->rc4_send_key, len, indata, outdata); } -void rc4_recv(unsigned long len, const unsigned char *indata, +/* + * rc4 decrypt received data + * + * \param len the number of bytes to decrypt + * \param indata pointer to the input data of length \a len + * \param outdata pointer that holds the decrypted data after return + * \param private_data pointer to the private client data containing + * the rc4 key + * */ +static void rc4_recv(unsigned long len, const unsigned char *indata, unsigned char *outdata, void *private_data) { struct private_client_data *pcd = private_data; RC4(&pcd->rc4_recv_key, len, indata, outdata); } - +/** + * close the connection to para_server and free all resources + * + * \param pcd pointer to the client data + * + * \sa client_open. + * */ void client_close(struct private_client_data *pcd) { - if (pcd) + if (!pcd) return; - if (pcd->fd >= 0) + if (pcd->fd >= 0) { + disable_crypt(pcd->fd); close(pcd->fd); + } free(pcd->user); free(pcd->config_file); free(pcd->key_file); + client_cmdline_parser_free(&pcd->conf); free(pcd); } -int client_parse_config(int argc, char *argv[], - struct private_client_data **pcd_ptr) +static int client_connect(struct private_client_data *pcd) +{ + int ret; + struct hostent *he; + struct sockaddr_in their_addr; + + pcd->fd = -1; + ret = get_host_info(pcd->conf.hostname_arg, &he); + if (ret < 0) + return ret; + /* get new socket */ + ret = get_socket(); + if (ret < 0) + return ret; + pcd->fd = ret; + /* init their_addr */ + init_sockaddr(&their_addr, pcd->conf.server_port_arg, he); + ret = para_connect(pcd->fd, &their_addr); + if (ret < 0) + goto err_out; + pcd->status = CL_CONNECTED; + ret = mark_fd_nonblock(pcd->fd); + if (ret < 0) + goto err_out; + 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); + return 1; +err_out: + close(pcd->fd); + pcd->fd = -1; + return ret; +} + +/** + * open connection to para_server + * + * \param argc usual argument count + * \param argv usual argument vector + * \param pcd_ptr points to dynamically allocated and initialized private client data + * upon successful return + * + * Check the command line options given by \a argc and argv, set default values + * for user name and rsa key file, read further option from the config file. + * Finally, establish a connection to para_server. + * + * \return Positive on success, negative on errors. + */ +int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr) { char *home = para_homedir(); struct stat statbuf; @@ -66,9 +131,11 @@ int client_parse_config(int argc, char *argv[], struct private_client_data *pcd = para_calloc(sizeof(struct private_client_data)); + *pcd_ptr = pcd; pcd->fd = -1; - cmdline_parser(argc, argv, &pcd->conf); - ret = - E_CLIENT_SYNTAX; + ret = client_cmdline_parser(argc, argv, &pcd->conf); + HANDLE_VERSION_FLAG("client", pcd->conf); + ret = -E_CLIENT_SYNTAX; if (!pcd->conf.inputs_num) goto out; pcd->user = pcd->conf.user_given? @@ -86,32 +153,51 @@ int client_parse_config(int argc, char *argv[], ret = -E_NO_CONFIG; goto out; } - if (!ret) - cmdline_parser_configfile(pcd->config_file, &pcd->conf, 0, 0, 0); + if (!ret) { + struct client_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + client_cmdline_parser_config_file(pcd->config_file, + &pcd->conf, ¶ms); + } ret = 1; - *pcd_ptr = pcd; - 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 - ); + PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg); + PARA_INFO_LOG("config_file: %s\n", pcd->config_file); + PARA_INFO_LOG("key_file: %s\n", pcd->key_file); + PARA_NOTICE_LOG("connecting %s:%d\n", pcd->conf.hostname_arg, + pcd->conf.server_port_arg); + ret = client_connect(pcd); out: free(home); - if (ret < 0) + if (ret < 0) { + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); client_close(pcd); + *pcd_ptr = NULL; + } return ret; } +/** + * the preselect hook for server commands + * + * \param s pointer to the scheduler + * \param t pointer to the task struct for this command + * + * The task pointer must contain a pointer to the initialized client data + * structure as it is returned by client_open(). + * + * This function checks the state of the connection and adds the file descriptor + * of the connection to the read or write fd set of \a s accordingly. + * + * \sa register_task() client_open(), struct sched, struct task + */ void client_pre_select(struct sched *s, struct task *t) { struct private_client_data *pcd = t->private_data; - PARA_INFO_LOG("status %d\n", pcd->status); t->ret = 1; pcd->check_r = 0; pcd->check_w = 0; @@ -133,15 +219,15 @@ void client_pre_select(struct sched *s, struct task *t) pcd->check_w = 1; return; - case CL_RECEIVING_SERVER_OUTPUT: + case CL_RECEIVING: if (pcd->loaded < CLIENT_BUFSIZE - 1) { para_fd_set(pcd->fd, &s->rfds, &s->max_fileno); pcd->check_r = 1; } return; - case CL_SENDING_STDIN: + case CL_SENDING: if (*pcd->in_loaded) { - PARA_INFO_LOG("loaded: %d\n", *pcd->in_loaded); + PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded); para_fd_set(pcd->fd, &s->wfds, &s->max_fileno); pcd->check_w = 1; } else { @@ -167,11 +253,24 @@ static ssize_t client_recv_buffer(struct private_client_data *pcd) } +/** + * the post select hook for client commands + * + * \param s pointer to the scheduler + * \param t pointer to the task struct for this command + * + * Depending on the current state of the connection and the status of the read + * and write fd sets of \a s, this function performs the neccessary steps to + * authenticate the connection, to send the commmand given by \a + * t->private_data and to receive para_server's output, if any. + * + * \sa struct sched, struct task + */ void client_post_select(struct sched *s, struct task *t) { struct private_client_data *pcd = t->private_data; - PARA_INFO_LOG("status %d\n", pcd->status); +// PARA_INFO_LOG("status %d\n", pcd->status); t->ret = 1; if (pcd->fd < 0) return; @@ -228,7 +327,7 @@ void client_post_select(struct sched *s, struct task *t) if (t->ret < 0) return; bytes_received = t->ret; - PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server " + PARA_DEBUG_LOG("++++ server info ++++\n%s\n++++ end of server " "info ++++\n", pcd->buf); /* check if server has sent "Proceed" message */ t->ret = -E_CLIENT_AUTH; @@ -259,7 +358,7 @@ void client_post_select(struct sched *s, struct task *t) free(tmp); } command = para_strcat(command, EOC_MSG "\n"); - PARA_INFO_LOG("--> %s\n", command); + PARA_DEBUG_LOG("--> %s\n", command); t->ret = send_buffer(pcd->fd, command); free(command); if (t->ret > 0) @@ -273,58 +372,19 @@ void client_post_select(struct sched *s, struct task *t) return; t->ret = -E_HANDSHAKE_COMPLETE; if (strstr(pcd->buf, AWAITING_DATA_MSG)) - pcd->status = CL_SENDING_STDIN; + pcd->status = CL_SENDING; else - pcd->status = CL_RECEIVING_SERVER_OUTPUT; + pcd->status = CL_RECEIVING; return; - case CL_SENDING_STDIN: /* FIXME: might block */ - PARA_INFO_LOG("loaded: %d\n", *pcd->in_loaded); + case CL_SENDING: /* FIXME: might block */ + PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded); t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded); - if (t->ret <= 0) { - if (!t->ret) - t->ret = 1; + if (t->ret < 0) return; - } *pcd->in_loaded = 0; /* FIXME: short writes */ return; - case CL_RECEIVING_SERVER_OUTPUT: + case CL_RECEIVING: t->ret = client_recv_buffer(pcd); return; } - -} - -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; - 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; -out: - return ret; }