X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=b1eaa78b2db7563b699c6993509e738b12f665a8;hp=9886cfe5f93ef187f0f61fc0642a68b41f0b0619;hb=a9126f461792a84c760162ecb25100f1593d427d;hpb=08e8e00a1cd0d48bd9a4189661cd6336e063e887 diff --git a/client_common.c b/client_common.c index 9886cfe5..b1eaa78b 100644 --- a/client_common.c +++ b/client_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2008 Andre Noll + * Copyright (C) 1997-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,6 +8,7 @@ #include #include +#include #include "para.h" #include "error.h" @@ -22,33 +23,6 @@ #include "client.cmdline.h" #include "client.h" -/* - * 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 Result-pointer that holds the encrypted data. - * \param private_data Contains the rc4 key. - */ -static void rc4_send(unsigned long len, const unsigned char *indata, - unsigned char *outdata, void *private_data) -{ - struct client_task *ct = private_data; - RC4(&ct->rc4_send_key, len, indata, outdata); -} - -/* - * Rc4-decrypt received data. - * - * Parameters are identical to those of rc4_send. - */ -static void rc4_recv(unsigned long len, const unsigned char *indata, - unsigned char *outdata, void *private_data) -{ - struct client_task *ct = private_data; - RC4(&ct->rc4_recv_key, len, indata, outdata); -} - /** * Close the connection to para_server and free all resources. * @@ -60,10 +34,9 @@ void client_close(struct client_task *ct) { if (!ct) return; - if (ct->fd >= 0) { - disable_crypt(ct->fd); - close(ct->fd); - } + if (ct->rc4c.fd >= 0) + close(ct->rc4c.fd); + free(ct->buf); free(ct->user); free(ct->config_file); free(ct->key_file); @@ -91,27 +64,27 @@ static void client_pre_select(struct sched *s, struct task *t) ct->check_r = 0; ct->check_w = 0; - if (ct->fd < 0) + if (ct->rc4c.fd < 0) return; switch (ct->status) { case CL_CONNECTED: case CL_SENT_AUTH: case CL_SENT_CH_RESPONSE: case CL_SENT_COMMAND: - para_fd_set(ct->fd, &s->rfds, &s->max_fileno); + para_fd_set(ct->rc4c.fd, &s->rfds, &s->max_fileno); ct->check_r = 1; return; case CL_RECEIVED_WELCOME: case CL_RECEIVED_CHALLENGE: case CL_RECEIVED_PROCEED: - para_fd_set(ct->fd, &s->wfds, &s->max_fileno); + para_fd_set(ct->rc4c.fd, &s->wfds, &s->max_fileno); ct->check_w = 1; return; case CL_RECEIVING: if (ct->loaded < CLIENT_BUFSIZE - 1) { - para_fd_set(ct->fd, &s->rfds, &s->max_fileno); + para_fd_set(ct->rc4c.fd, &s->rfds, &s->max_fileno); ct->check_r = 1; } return; @@ -120,7 +93,7 @@ static void client_pre_select(struct sched *s, struct task *t) return; if (*ct->in_loaded) { PARA_INFO_LOG("loaded: %zd\n", *ct->in_loaded); - para_fd_set(ct->fd, &s->wfds, &s->max_fileno); + para_fd_set(ct->rc4c.fd, &s->wfds, &s->max_fileno); ct->check_w = 1; } else { if (*ct->in_error) { @@ -135,8 +108,14 @@ static void client_pre_select(struct sched *s, struct task *t) static ssize_t client_recv_buffer(struct client_task *ct) { - ssize_t ret = recv_buffer(ct->fd, ct->buf + ct->loaded, - CLIENT_BUFSIZE - ct->loaded); + ssize_t ret; + + if (ct->status < CL_RECEIVED_PROCEED) + ret = recv_buffer(ct->rc4c.fd, ct->buf + ct->loaded, + CLIENT_BUFSIZE - ct->loaded); + else + ret = rc4_recv_buffer(&ct->rc4c, ct->buf + ct->loaded, + CLIENT_BUFSIZE - ct->loaded); if (!ret) return -E_SERVER_EOF; if (ret > 0) @@ -163,13 +142,13 @@ static void client_post_select(struct sched *s, struct task *t) struct client_task *ct = container_of(t, struct client_task, task); t->error = 0; - if (ct->fd < 0) + if (ct->rc4c.fd < 0) return; if (!ct->check_r && !ct->check_w) return; - if (ct->check_r && !FD_ISSET(ct->fd, &s->rfds)) + if (ct->check_r && !FD_ISSET(ct->rc4c.fd, &s->rfds)) return; - if (ct->check_w && !FD_ISSET(ct->fd, &s->wfds)) + if (ct->check_w && !FD_ISSET(ct->rc4c.fd, &s->wfds)) return; switch (ct->status) { case CL_CONNECTED: /* receive welcome message */ @@ -178,10 +157,9 @@ static void client_post_select(struct sched *s, struct task *t) ct->status = CL_RECEIVED_WELCOME; return; case CL_RECEIVED_WELCOME: /* send auth command */ - sprintf(ct->buf, "auth %s%s", ct->conf.plain_given? - "" : "rc4 ", ct->user); + sprintf(ct->buf, "auth rc4 %s", ct->user); PARA_INFO_LOG("--> %s\n", ct->buf); - t->error = send_buffer(ct->fd, ct->buf); + t->error = send_buffer(ct->rc4c.fd, ct->buf); if (t->error >= 0) ct->status = CL_SENT_AUTH; return; @@ -204,7 +182,7 @@ static void client_post_select(struct sched *s, struct task *t) return; case CL_RECEIVED_CHALLENGE: /* send decrypted challenge */ PARA_INFO_LOG("--> %lu\n", ct->challenge_nr); - t->error = send_va_buffer(ct->fd, "%s%lu", CHALLENGE_RESPONSE_MSG, + t->error = send_va_buffer(ct->rc4c.fd, "%s%lu", CHALLENGE_RESPONSE_MSG, ct->challenge_nr); if (t->error > 0) ct->status = CL_SENT_CH_RESPONSE; @@ -220,13 +198,11 @@ static void client_post_select(struct sched *s, struct task *t) bytes_received = t->error; PARA_DEBUG_LOG("++++ server info ++++\n%s\n++++ end of server " "info ++++\n", ct->buf); - /* check if server has sent "Proceed" message */ + /* check if server has sent "Proceed" message and the rc4 keys */ t->error = -E_CLIENT_AUTH; - if (!strstr(ct->buf, PROCEED_MSG)) + if (bytes_received < PROCEED_MSG_LEN + 2 * RC4_KEY_LEN) return; - t->error = 0; - ct->status = CL_RECEIVED_PROCEED; - if (bytes_received < PROCEED_MSG_LEN + 32) + if (!strstr(ct->buf, PROCEED_MSG)) return; PARA_INFO_LOG("decrypting session key\n"); t->error = para_decrypt_buffer(ct->key_file, rc4_buf, @@ -234,9 +210,10 @@ static void client_post_select(struct sched *s, struct task *t) bytes_received - PROCEED_MSG_LEN - 1); if (t->error < 0) return; - RC4_set_key(&ct->rc4_send_key, RC4_KEY_LEN, rc4_buf); - RC4_set_key(&ct->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN); - enable_crypt(ct->fd, rc4_recv, rc4_send, ct); + RC4_set_key(&ct->rc4c.send_key, RC4_KEY_LEN, rc4_buf); + RC4_set_key(&ct->rc4c.recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN); + ct->status = CL_RECEIVED_PROCEED; + return; } case CL_RECEIVED_PROCEED: /* concat args and send command */ { @@ -250,7 +227,7 @@ static void client_post_select(struct sched *s, struct task *t) } command = para_strcat(command, EOC_MSG "\n"); PARA_DEBUG_LOG("--> %s\n", command); - t->error = send_buffer(ct->fd, command); + t->error = rc4_send_buffer(&ct->rc4c, command); free(command); if (t->error > 0) ct->status = CL_SENT_COMMAND; @@ -268,7 +245,7 @@ static void client_post_select(struct sched *s, struct task *t) return; case CL_SENDING: /* FIXME: might block */ PARA_INFO_LOG("loaded: %zd\n", *ct->in_loaded); - t->error = send_bin_buffer(ct->fd, ct->inbuf, *ct->in_loaded); + t->error = rc4_send_bin_buffer(&ct->rc4c, ct->inbuf, *ct->in_loaded); if (t->error < 0) return; *ct->in_loaded = 0; @@ -284,14 +261,14 @@ static int client_connect(struct client_task *ct) { int ret; - ct->fd = -1; + ct->rc4c.fd = -1; ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, ct->conf.hostname_arg, ct->conf.server_port_arg); if (ret < 0) return ret; - ct->fd = ret; + ct->rc4c.fd = ret; ct->status = CL_CONNECTED; - ret = mark_fd_nonblocking(ct->fd); + ret = mark_fd_nonblocking(ct->rc4c.fd); if (ret < 0) goto err_out; ct->task.pre_select = client_pre_select; @@ -300,8 +277,8 @@ static int client_connect(struct client_task *ct) register_task(&ct->task); return 1; err_out: - close(ct->fd); - ct->fd = -1; + close(ct->rc4c.fd); + ct->rc4c.fd = -1; return ret; } @@ -312,6 +289,7 @@ err_out: * \param argv Usual argument vector. * \param ct_ptr Points to dynamically allocated and initialized client task * struct upon successful return. + * \param loglevel If not \p NULL, the number of the loglevel is stored here. * * 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. @@ -319,15 +297,16 @@ err_out: * * \return Standard. */ -int client_open(int argc, char *argv[], struct client_task **ct_ptr) +int client_open(int argc, char *argv[], struct client_task **ct_ptr, + int *loglevel) { char *home = para_homedir(); - struct stat statbuf; int ret; struct client_task *ct = para_calloc(sizeof(struct client_task)); + ct->buf = para_malloc(CLIENT_BUFSIZE); *ct_ptr = ct; - ct->fd = -1; + ct->rc4c.fd = -1; ret = -E_CLIENT_SYNTAX; if (client_cmdline_parser(argc, argv, &ct->conf)) goto out; @@ -345,12 +324,12 @@ int client_open(int argc, char *argv[], struct client_task **ct_ptr) ct->config_file = ct->conf.config_file_given? para_strdup(ct->conf.config_file_arg) : make_message("%s/.paraslash/client.conf", home); - ret = stat(ct->config_file, &statbuf); - if (ret && ct->conf.config_file_given) { + ret = file_exists(ct->config_file); + if (!ret && ct->conf.config_file_given) { ret = -E_NO_CONFIG; goto out; } - if (!ret) { + if (ret) { struct client_cmdline_parser_params params = { .override = 0, .initialize = 0, @@ -363,8 +342,9 @@ int client_open(int argc, char *argv[], struct client_task **ct_ptr) &ct->conf, ¶ms)) goto out; } - ret = 1; - PARA_INFO_LOG("loglevel: %d\n", ct->conf.loglevel_arg); + if (loglevel) + *loglevel = get_loglevel_by_name(ct->conf.loglevel_arg); + PARA_INFO_LOG("loglevel: %s\n", ct->conf.loglevel_arg); PARA_INFO_LOG("config_file: %s\n", ct->config_file); PARA_INFO_LOG("key_file: %s\n", ct->key_file); PARA_NOTICE_LOG("connecting %s:%d\n", ct->conf.hostname_arg,