make para_client use the scheduler.
authorAndre <maan@p133.(none)>
Mon, 12 Jun 2006 08:44:54 +0000 (10:44 +0200)
committerAndre <maan@p133.(none)>
Mon, 12 Jun 2006 08:44:54 +0000 (10:44 +0200)
client.c
configure.ac
error.h

index 3fc673e..bd7b9f2 100644 (file)
--- a/client.c
+++ b/client.c
 /** \file client.c the client program used to connect to para_server */
 
 #include "para.h"
+#include "list.h"
+#include "sched.h"
 #include "config.h"
 #include "client.cmdline.h"
 #include "crypt.h"
 #include "rc4.h"
 #include <openssl/rc4.h>
 #include "net.h"
+#include "fd.h"
 #include "string.h"
+#include "stdin.h"
+#include "stdout.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};
+enum {
+       CL_CONNECTED,
+       CL_RECEIVED_WELCOME,
+       CL_SENT_AUTH,
+       CL_RECEIVED_CHALLENGE,
+       CL_SENT_CH_RESPONSE,
+       CL_RECEIVED_PROCEED,
+       CL_SENT_COMMAND,
+       CL_SENDING_STDIN,
+       CL_RECEIVING_SERVER_OUTPUT
+};
+
+#define CLIENT_BUFSIZE 8192
 
 struct private_client_data {
        int status;
@@ -40,16 +56,25 @@ struct private_client_data {
        char *user;
        RC4_KEY rc4_recv_key;
        RC4_KEY rc4_send_key;
-
-       char *in_buf;
+       struct task task;
+       int eof;
+       char buf[CLIENT_BUFSIZE];
+       size_t loaded;
+       int check_r;
+       int check_w;
+       long unsigned challenge_nr;
+       /* only used if stdin gets sent to para_server */
+       char *inbuf;
        size_t *in_loaded;
-       char *out_buf;
-       size_t *out_loaded;
+       int *in_eof;
 };
 
 INIT_CLIENT_ERRLISTS;
 
 static struct private_client_data *pcd;
+static struct stdin_task sit;
+static struct stdout_task sot;
+
 
 static void rc4_send(unsigned long len, const unsigned char *indata,
                unsigned char *outdata)
@@ -91,16 +116,6 @@ static void client_close(struct private_client_data *pcd)
        free(pcd);
 }
 
-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 client_parse_config(int argc, char *argv[],
                struct private_client_data **pcd_ptr)
 {
@@ -133,32 +148,211 @@ static int client_parse_config(int argc, char *argv[],
        if (!ret)
                cmdline_parser_configfile(p->config_file, &p->conf, 0, 0, 0);
        ret = 1;
+       *pcd_ptr = p;
+       PARA_INFO_LOG(
+               "current loglevel: %d\n"
+               "using config_file: %s\n"
+               "using key_file: %s\n"
+               "connecting to %s:%d\n" ,
+               p->conf.loglevel_arg,
+               p->config_file,
+               p->key_file,
+               p->conf.hostname_arg, p->conf.server_port_arg
+       );
 out:
        free(home);
        if (ret < 0)
                client_close(p);
-       else
-               *pcd_ptr = p;
        return ret;
 }
 
-static int send_stdin(int fd)
+static void client_pre_select(struct sched *s, struct task *t)
 {
-       char buf[8192];
-       int ret;
+       struct private_client_data *p = t->private_data;
+
+       PARA_INFO_LOG("status %d\n", p->status);
+       t->ret = 1;
+       pcd->check_r = 0;
+       pcd->check_w = 0;
+       if (p->fd < 0)
+               return;
+       switch (pcd->status) {
+       case CL_CONNECTED:
+       case CL_SENT_AUTH:
+       case CL_SENT_CH_RESPONSE:
+       case CL_SENT_COMMAND:
+               para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
+               pcd->check_r = 1;
+               return;
+
+       case CL_RECEIVED_WELCOME:
+       case CL_RECEIVED_CHALLENGE:
+       case CL_RECEIVED_PROCEED:
+               para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
+               pcd->check_w = 1;
+               return;
 
-       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;
+       case CL_RECEIVING_SERVER_OUTPUT:
+               if (pcd->loaded < CLIENT_BUFSIZE - 1) {
+                       para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
+                       p->check_r = 1;
+               }
+               return;
+       case CL_SENDING_STDIN:
+               if (*p->in_loaded) {
+                       PARA_INFO_LOG("loaded: %d\n", *p->in_loaded);
+                       para_fd_set(p->fd, &s->wfds, &s->max_fileno);
+                       p->check_w = 1;
+               } else {
+                       if (*p->in_eof) {
+                               t->ret = -E_INPUT_EOF;
+                               s->timeout.tv_sec = 0;
+                               s->timeout.tv_usec = 1;
+                       }
+               }
+               return;
        }
-       return 1;
 }
 
+static ssize_t client_recv_buffer(struct private_client_data *p)
+{
+       ssize_t ret = recv_buffer(p->fd, p->buf + p->loaded,
+               CLIENT_BUFSIZE - p->loaded);
+       if (!ret)
+               return -E_SERVER_EOF;
+       if (ret > 0)
+               p->loaded += ret;
+       return ret;
+
+}
+
+static void client_post_select(struct sched *s, struct task *t)
+{
+       struct private_client_data *p = t->private_data;
+
+       PARA_INFO_LOG("status %d\n", p->status);
+       t->ret = 1;
+       if (p->fd < 0)
+               return;
+       if (!p->check_r && !p->check_w)
+               return;
+       if (p->check_r && !FD_ISSET(p->fd, &s->rfds))
+               return;
+       if (p->check_w && !FD_ISSET(p->fd, &s->wfds))
+               return;
+       switch (p->status) {
+       case CL_CONNECTED: /* receive welcome message */
+               t->ret = client_recv_buffer(p);
+               if (t->ret > 0)
+                       p->status = CL_RECEIVED_WELCOME;
+               return;
+       case CL_RECEIVED_WELCOME: /* send auth command */
+               sprintf(p->buf, "auth %s%s", p->conf.plain_given?
+                       "" : "rc4 ", p->user);
+               PARA_INFO_LOG("--> %s\n", p->buf);
+               t->ret = send_buffer(p->fd, p->buf);
+               if (t->ret >= 0)
+                       p->status = CL_SENT_AUTH;
+               return;
+       case CL_SENT_AUTH: /* receive challenge number */
+               p->loaded = 0;
+               t->ret = client_recv_buffer(p);
+               if (t->ret < 0)
+                       return;
+               if (t->ret != 64) {
+                       t->ret = -E_INVALID_CHALLENGE;
+                       PARA_ERROR_LOG("received the following: %s\n", p->buf);
+                       return;
+               }
+               PARA_INFO_LOG("%s", "<-- [challenge]\n");
+               /* decrypt challenge number */
+               t->ret = para_decrypt_challenge(p->key_file, &p->challenge_nr,
+                       (unsigned char *) p->buf, 64);
+               if (t->ret > 0)
+                       p->status = CL_RECEIVED_CHALLENGE;
+               return;
+       case CL_RECEIVED_CHALLENGE: /* send decrypted challenge */
+               PARA_INFO_LOG("--> %lu\n", p->challenge_nr);
+               t->ret = send_va_buffer(p->fd, "%s%lu", CHALLENGE_RESPONSE_MSG,
+                       p->challenge_nr);
+               if (t->ret > 0)
+                       p->status = CL_SENT_CH_RESPONSE;
+               return;
+       case CL_SENT_CH_RESPONSE: /* read server response */
+               {
+               size_t bytes_received;
+               unsigned char rc4_buf[2 * RC4_KEY_LEN] = "";
+               p->loaded = 0;
+               t->ret = client_recv_buffer(p);
+               if (t->ret < 0)
+                       return;
+               bytes_received = t->ret;
+               PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server "
+                       "info ++++\n", p->buf);
+               /* check if server has sent "Proceed" message */
+               t->ret = -E_CLIENT_AUTH;
+               if (!strstr(p->buf, PROCEED_MSG))
+                       return;
+               t->ret = 1;
+               p->status = CL_RECEIVED_PROCEED;
+               if (bytes_received < PROCEED_MSG_LEN + 32)
+                       return;
+               PARA_INFO_LOG("%s", "decrypting session key\n");
+               t->ret = para_decrypt_buffer(p->key_file, rc4_buf,
+                       (unsigned char *)p->buf + PROCEED_MSG_LEN + 1,
+                       bytes_received - PROCEED_MSG_LEN - 1);
+               if (t->ret < 0)
+                       return;
+               RC4_set_key(&p->rc4_send_key, RC4_KEY_LEN, rc4_buf);
+               RC4_set_key(&p->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
+               enable_crypt(p->fd, rc4_recv, rc4_send);
+               }
+       case CL_RECEIVED_PROCEED: /* concat args and send command */
+               {
+               int i;
+               char *command = NULL;
+               for (i = 0; i < p->conf.inputs_num; i++) {
+                       char *tmp = command;
+                       command = make_message("%s\n%s", command?
+                               command : "", p->conf.inputs[i]);
+                       free(tmp);
+               }
+               command = para_strcat(command, EOC_MSG "\n");
+               PARA_INFO_LOG("--> %s\n", command);
+               t->ret = send_buffer(p->fd, command);
+               free(command);
+               if (t->ret > 0)
+                       p->status = CL_SENT_COMMAND;
+               return;
+               }
+       case CL_SENT_COMMAND:
+               p->loaded = 0;
+               t->ret = client_recv_buffer(p);
+               p->loaded = 0;
+               if (t->ret < 0)
+                       return;
+               t->ret = -E_HANDSHAKE_COMPLETE;
+               if (strstr(p->buf, AWAITING_DATA_MSG))
+                       p->status = CL_SENDING_STDIN;
+               else
+                       p->status = CL_RECEIVING_SERVER_OUTPUT;
+               return;
+       case CL_SENDING_STDIN: /* FIXME: might block */
+               PARA_INFO_LOG("loaded: %d\n", *p->in_loaded);
+               t->ret = send_bin_buffer(p->fd, p->inbuf, *p->in_loaded);
+               if (t->ret <= 0) {
+                       if (!t->ret)
+                               t->ret = 1;
+                       return;
+               }
+               *p->in_loaded = 0; /* FIXME: short writes */
+               return;
+       case CL_RECEIVING_SERVER_OUTPUT:
+               t->ret = client_recv_buffer(p);
+               return;
+       }
+
+}
 static int client_open(struct private_client_data *pcd)
 {
        int ret;
@@ -183,11 +377,42 @@ static int client_open(struct private_client_data *pcd)
        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;
 }
 
+static void client_event_handler(struct task *t)
+{
+       struct private_client_data *p = t->private_data;
+
+       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+       if (t->ret != -E_HANDSHAKE_COMPLETE) {
+               unregister_task(t);
+               p->eof = 1;
+               return;
+       }
+       if (p->status == CL_SENDING_STDIN) {
+               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;
+       }
+       stdout_set_defaults(&sot);
+       sot.buf = p->buf;
+       sot.loaded = &p->loaded;
+       sot.input_eof = &p->eof;
+       register_task(&sot.task);
+}
 
 /*
  * MAIN
@@ -195,125 +420,20 @@ out:
 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;
 
+       init_sched();
+       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
-       );
+       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 encryption activated: %x:%x:%x:%x\n",
-                       rc4_buf[0], rc4_buf[1], rc4_buf[2], rc4_buf[3]);
-               enable_crypt(pcd->fd, rc4_recv, rc4_send);
-       }
-       /* concat args */
-       for (i = 0; i < pcd->conf.inputs_num; i++)
-               append_str(&command, pcd->conf.inputs[i]);
-       /* 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)
index dc48c03..7f3c85d 100644 (file)
@@ -86,7 +86,7 @@ write_ldflags=""
 write_writers="file"
 
 client_cmdline_objs="client.cmdline"
-client_errlist_objs="client net string crypt"
+client_errlist_objs="client net string crypt fd sched stdin stdout"
 client_ldflags=""
 
 ########################################################################### ssl
diff --git a/error.h b/error.h
index 7d10ff2..0c862a5 100644 (file)
--- a/error.h
+++ b/error.h
@@ -106,6 +106,10 @@ extern const char **para_errlist[];
        PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
        PARA_ERROR(SHORT_CLIENT_WRITE, "short client write"), \
        PARA_ERROR(NO_CONFIG, "config file not found"), \
+       PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
+       PARA_ERROR(INPUT_EOF, "end of input"), \
+       PARA_ERROR(HANDSHAKE_COMPLETE, ""), /* not really an error */ \
+
 
 #define SCHED_ERRORS \
        PARA_ERROR(TASK_KILLED, "task killed"), \