/** \file client.c the client program used to connect to para_server */
#include "para.h"
-#include "config.h"
+#include "list.h"
+#include "sched.h"
#include "client.cmdline.h"
-#include "crypt.h"
-#include "rc4.h"
-#include <openssl/rc4.h>
-#include "net.h"
#include "string.h"
+#include "stdin.h"
+#include "stdout.h"
+#include "client.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 stdin_task sit;
+static struct stdout_task sot;
/*
* client log function
va_end(argp);
}
-static void client_close(struct private_client_data *pcd)
-{
- if (pcd)
- return;
- if (pcd->fd >= 0)
- close(pcd->fd);
- free(pcd->user);
- free(pcd->config_file);
- free(pcd->key_file);
- free(pcd);
-}
-
-static int client_parse_config(int argc, char *argv[],
- struct private_client_data **pcd_ptr)
+static void client_event_handler(struct task *t)
{
- char *home = para_homedir();
- struct stat statbuf;
- int ret;
- struct private_client_data *p =
- para_calloc(sizeof(struct private_client_data));
+ struct private_client_data *p = t->private_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;
+ PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+ if (t->ret != -E_HANDSHAKE_COMPLETE) {
+ unregister_task(t);
+ p->eof = 1;
+ return;
}
- 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 void rc4_send(unsigned long len, const unsigned char *indata,
- unsigned char *outdata)
-{
- 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);
-}
-
-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 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 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 (p->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;
+ return;
}
- return 1;
+ stdout_set_defaults(&sot);
+ sot.buf = p->buf;
+ sot.loaded = &p->loaded;
+ sot.input_eof = &p->eof;
+ register_task(&sot.task);
}
/*
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] = "";
+ int ret;
+ struct sched s;
+ s.default_timeout.tv_sec = 1;
+ s.default_timeout.tv_usec = 0;
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
- );
- /* concat args */
- for (i = 0; i < pcd->conf.inputs_num; i++)
- append_str(&command, pcd->conf.inputs[i]);
- crypt_function_recv = NULL;
- crypt_function_send = NULL;
- /* 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);
+ pcd->task.event_handler = client_event_handler;
+ 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 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);
- ret = send_buffer(pcd->fd, command);
- if (ret < 0)
- goto out;
- free(command);
- command = NULL;
- ret = send_buffer(pcd->fd, EOC_MSG "\n");
- 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;
- }
- }
+ ret = sched(&s);
client_close(pcd);
out:
if (ret < 0)
projects / paraslash.git / blobdiff