ortp_recv: Set remote address
[paraslash.git] / client.c
index 914c5fb..88ea5af 100644 (file)
--- a/client.c
+++ b/client.c
 /** \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"
 
-struct gengetopt_args_info args_info;
+INIT_CLIENT_ERRLISTS;
+
+static struct private_client_data *pcd;
+static struct stdin_task sit;
+static struct stdout_task sot;
 
 /*
  * client log function
@@ -35,83 +40,39 @@ struct gengetopt_args_info args_info;
 void para_log(int ll, const char* fmt,...)
 {
        va_list argp;
-       FILE *outfd;
 
        /* ignore log message if loglevel is not high enough */
-       if (ll < args_info.loglevel_arg)
+       if (pcd && ll < pcd->conf.loglevel_arg)
                return;
        va_start(argp, fmt);
        vfprintf(stderr, fmt, argp);
        va_end(argp);
 }
 
-void get_options(int argc, char *argv[],
-       char **config_file, char **key_file)
+static void client_event_handler(struct task *t)
 {
-       char *home;
-       static char default_key_file[_POSIX_PATH_MAX] = "";
-       static char default_config_file[_POSIX_PATH_MAX] = "";
-       struct stat statbuf;
-       int ret;
+       struct private_client_data *p = t->private_data;
 
-       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);
+       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+       if (t->ret != -E_HANDSHAKE_COMPLETE) {
+               unregister_task(t);
+               p->eof = 1;
+               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 (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;
        }
-       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 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);
+       stdout_set_defaults(&sot);
+       sot.buf = p->buf;
+       sot.loaded = &p->loaded;
+       sot.input_eof = &p->eof;
+       register_task(&sot.task);
 }
 
 /*
@@ -120,140 +81,22 @@ static void append_str(char **data, const char* append)
 int main(int argc, char *argv[])
 {
 
-       int sockfd, numbytes, i, 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;
-
-       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
-       );
-       if (!args_info.inputs_num) {
-               PARA_ERROR_LOG("%s", "syntax error\n");
-               exit(EXIT_FAILURE);
-       }
-       /* concat args */
-       for (i = 0; i < args_info.inputs_num; i++)
-               append_str(&command, args_info.inputs[i]);
-
-       crypt_function_recv = NULL;
-       crypt_function_send = NULL;
-       /* 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);
-               exit(EXIT_FAILURE);
-       }
-       PARA_INFO_LOG("<-- [challenge (%i bytes)]\n", numbytes);
-       /* decrypt challenge number */
-       ret = para_decrypt_challenge(key_file, &challenge_nr, (unsigned char *) buf,
-               numbytes);
-       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");
-       received = 0;
-       while ((numbytes = recv_bin_buffer(sockfd, buf, sizeof(buf) - 1)) > 0) {
-               buf[numbytes] = '\0';
-               if (!received && strstr(buf, AWAITING_DATA_MSG)) {
-                       PARA_NOTICE_LOG("%s", "sending stdin\n");
-                       while ((ret = read(STDIN_FILENO, buf,
-                                       sizeof(buf))) > 0) {
-                               if (send_bin_buffer(sockfd, buf, ret) < 0)
-                                       break;
-                       }
-                       PARA_NOTICE_LOG("%s", "closing connection\n");
-                       numbytes = 1;
-                       break;
-               }
-               received = 1;
-               if (write(STDOUT_FILENO, buf, numbytes) != numbytes)
-                       break;
-       }
-       if (!numbytes)
-               PARA_NOTICE_LOG("%s", "connection closed by peer\n");
-       close(sockfd);
-       return ret >= 0? 0: 1;
+       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;
+       pcd->task.event_handler = client_event_handler;
+       ret = client_open(pcd);
+       if (ret < 0)
+               goto out;
+       ret = sched(&s);
+       client_close(pcd);
+out:
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }