server: Include git version in output of com_si().
[paraslash.git] / client_common.c
index b6bfde9..a7115fd 100644 (file)
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 #include "client.cmdline.h"
 #include "client.h"
 #include "hash.h"
 #include "client.cmdline.h"
 #include "client.h"
 #include "hash.h"
+#include "buffer_tree.h"
+
+/** The size of the receiving buffer. */
+#define CLIENT_BUFSIZE 4000
 
 /**
  * Close the connection to para_server and free all resources.
 
 /**
  * Close the connection to para_server and free all resources.
@@ -38,7 +42,6 @@ void client_close(struct client_task *ct)
                return;
        if (ct->rc4c.fd >= 0)
                close(ct->rc4c.fd);
                return;
        if (ct->rc4c.fd >= 0)
                close(ct->rc4c.fd);
-       free(ct->buf);
        free(ct->user);
        free(ct->config_file);
        free(ct->key_file);
        free(ct->user);
        free(ct->config_file);
        free(ct->key_file);
@@ -62,10 +65,10 @@ void client_close(struct client_task *ct)
  */
 static void client_pre_select(struct sched *s, struct task *t)
 {
  */
 static void client_pre_select(struct sched *s, struct task *t)
 {
+       int ret;
        struct client_task *ct = container_of(t, struct client_task, task);
        struct client_task *ct = container_of(t, struct client_task, task);
+       struct btr_node *btrn = ct->btrn;
 
 
-       ct->check_r = 0;
-       ct->check_w = 0;
        if (ct->rc4c.fd < 0)
                return;
        switch (ct->status) {
        if (ct->rc4c.fd < 0)
                return;
        switch (ct->status) {
@@ -74,55 +77,59 @@ static void client_pre_select(struct sched *s, struct task *t)
        case CL_SENT_CH_RESPONSE:
        case CL_SENT_COMMAND:
                para_fd_set(ct->rc4c.fd, &s->rfds, &s->max_fileno);
        case CL_SENT_CH_RESPONSE:
        case CL_SENT_COMMAND:
                para_fd_set(ct->rc4c.fd, &s->rfds, &s->max_fileno);
-               ct->check_r = 1;
                return;
 
        case CL_RECEIVED_WELCOME:
                return;
 
        case CL_RECEIVED_WELCOME:
-       case CL_RECEIVED_CHALLENGE:
        case CL_RECEIVED_PROCEED:
                para_fd_set(ct->rc4c.fd, &s->wfds, &s->max_fileno);
        case CL_RECEIVED_PROCEED:
                para_fd_set(ct->rc4c.fd, &s->wfds, &s->max_fileno);
-               ct->check_w = 1;
                return;
 
        case CL_RECEIVING:
                return;
 
        case CL_RECEIVING:
-               if (ct->loaded < CLIENT_BUFSIZE - 1) {
-                       para_fd_set(ct->rc4c.fd, &s->rfds, &s->max_fileno);
-                       ct->check_r = 1;
+               ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
+               if (ret != 0) {
+                       if (ret < 0)
+                               sched_min_delay(s);
+                       else
+                               para_fd_set(ct->rc4c.fd, &s->rfds,
+                                       &s->max_fileno);
                }
                return;
        case CL_SENDING:
                }
                return;
        case CL_SENDING:
-               if (!ct->in_loaded) /* stdin task not yet started */
-                       return;
-               if (*ct->in_loaded) {
-                       PARA_INFO_LOG("loaded: %zd\n", *ct->in_loaded);
-                       para_fd_set(ct->rc4c.fd, &s->wfds, &s->max_fileno);
-                       ct->check_w = 1;
-               } else {
-                       if (*ct->in_error) {
-                               t->error = *ct->in_error;
-                               s->timeout.tv_sec = 0;
-                               s->timeout.tv_usec = 1;
-                       }
+               ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+               if (ret != 0) {
+                       if (ret < 0)
+                               sched_min_delay(s);
+                       else
+                               para_fd_set(ct->rc4c.fd, &s->wfds,
+                                       &s->max_fileno);
                }
                return;
        }
 }
 
                }
                return;
        }
 }
 
-static ssize_t client_recv_buffer(struct client_task *ct)
+static int client_recv_buffer(struct client_task *ct, fd_set *rfds,
+               char *buf, size_t sz, size_t *n)
 {
 {
-       ssize_t ret;
+       int ret;
 
        if (ct->status < CL_SENT_CH_RESPONSE)
 
        if (ct->status < CL_SENT_CH_RESPONSE)
-               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 read_nonblock(ct->rc4c.fd, buf, sz, rfds, n);
+
+       *n = 0;
+       ret = rc4_recv_buffer(&ct->rc4c, buf, sz);
+       /*
+        * rc4_recv_buffer is used with blocking fds elsewhere, so it
+        * does not use the nonblock-API. Therefore we need to
+        * check for EOF and EAGAIN.
+        */
+       if (ret == 0)
                return -E_SERVER_EOF;
                return -E_SERVER_EOF;
-       if (ret > 0)
-               ct->loaded += ret;
-       return ret;
+       if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
+               return 0;
+       if (ret < 0)
+               return ret;
+       *n = ret;
+       return 0;
 }
 
 /**
 }
 
 /**
@@ -141,87 +148,84 @@ static ssize_t client_recv_buffer(struct client_task *ct)
 static void client_post_select(struct sched *s, struct task *t)
 {
        struct client_task *ct = container_of(t, struct client_task, task);
 static void client_post_select(struct sched *s, struct task *t)
 {
        struct client_task *ct = container_of(t, struct client_task, task);
+       struct btr_node *btrn = ct->btrn;
+       int ret = 0;
+       size_t n;
+       char buf[CLIENT_BUFSIZE];
 
        t->error = 0;
        if (ct->rc4c.fd < 0)
                return;
 
        t->error = 0;
        if (ct->rc4c.fd < 0)
                return;
-       if (!ct->check_r && !ct->check_w)
-               return;
-       if (ct->check_r && !FD_ISSET(ct->rc4c.fd, &s->rfds))
-               return;
-       if (ct->check_w && !FD_ISSET(ct->rc4c.fd, &s->wfds))
-               return;
        switch (ct->status) {
        case CL_CONNECTED: /* receive welcome message */
        switch (ct->status) {
        case CL_CONNECTED: /* receive welcome message */
-               t->error = client_recv_buffer(ct);
-               if (t->error < 0)
-                       goto err;
+               ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+               if (ret < 0 || n == 0)
+                       goto out;
                ct->status = CL_RECEIVED_WELCOME;
                return;
        case CL_RECEIVED_WELCOME: /* send auth command */
                ct->status = CL_RECEIVED_WELCOME;
                return;
        case CL_RECEIVED_WELCOME: /* send auth command */
-               sprintf(ct->buf, AUTH_REQUEST_MSG "%s", ct->user);
-               PARA_INFO_LOG("--> %s\n", ct->buf);
-               t->error = send_buffer(ct->rc4c.fd, ct->buf);
-               if (t->error < 0)
-                       goto err;
+               sprintf(buf, AUTH_REQUEST_MSG "%s", ct->user);
+               PARA_INFO_LOG("--> %s\n", buf);
+               if (!FD_ISSET(ct->rc4c.fd, &s->wfds))
+                       return;
+               ret = send_buffer(ct->rc4c.fd, buf);
+               if (ret < 0)
+                       goto out;
                ct->status = CL_SENT_AUTH;
                return;
                ct->status = CL_SENT_AUTH;
                return;
-       case CL_SENT_AUTH: /* receive challenge and rc4 keys */
-               ct->loaded = 0;
-               t->error = client_recv_buffer(ct);
-               if (t->error < 0)
-                       goto err;
-               ct->loaded = t->error;
-               PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", ct->loaded);
-               ct->status = CL_RECEIVED_CHALLENGE;
-               return;
-       case CL_RECEIVED_CHALLENGE:
+       case CL_SENT_AUTH:
+               /*
+                * Receive challenge and rc4 keys, decrypt the challenge and
+                * send back the hash of the decrypted challenge.
+                */
                {
                /* decrypted challenge/rc4 buffer */
                unsigned char crypt_buf[1024];
                /* the SHA1 of the decrypted challenge */
                unsigned char challenge_sha1[HASH_SIZE];
 
                {
                /* decrypted challenge/rc4 buffer */
                unsigned char crypt_buf[1024];
                /* the SHA1 of the decrypted challenge */
                unsigned char challenge_sha1[HASH_SIZE];
 
-               t->error = para_decrypt_buffer(ct->key_file, crypt_buf,
-                       (unsigned char *)ct->buf, ct->loaded);
-               if (t->error < 0)
-                       goto err;
+               ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+               if (ret < 0 || n == 0)
+                       goto out;
+               PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", n);
+               ret = para_decrypt_buffer(ct->key_file, crypt_buf,
+                       (unsigned char *)buf, n);
+               if (ret < 0)
+                       goto out;
                sha1_hash((char *)crypt_buf, CHALLENGE_SIZE, challenge_sha1);
                RC4_set_key(&ct->rc4c.send_key, RC4_KEY_LEN,
                        crypt_buf + CHALLENGE_SIZE);
                RC4_set_key(&ct->rc4c.recv_key, RC4_KEY_LEN,
                        crypt_buf + CHALLENGE_SIZE + RC4_KEY_LEN);
                sha1_hash((char *)crypt_buf, CHALLENGE_SIZE, challenge_sha1);
                RC4_set_key(&ct->rc4c.send_key, RC4_KEY_LEN,
                        crypt_buf + CHALLENGE_SIZE);
                RC4_set_key(&ct->rc4c.recv_key, RC4_KEY_LEN,
                        crypt_buf + CHALLENGE_SIZE + RC4_KEY_LEN);
-               hash_to_asc(challenge_sha1, ct->buf);
-               PARA_INFO_LOG("--> %s\n", ct->buf);
-               t->error = send_bin_buffer(ct->rc4c.fd, (char *)challenge_sha1,
+               hash_to_asc(challenge_sha1, buf);
+               PARA_INFO_LOG("--> %s\n", buf);
+               ret = send_bin_buffer(ct->rc4c.fd, (char *)challenge_sha1,
                        HASH_SIZE);
                        HASH_SIZE);
-               if (t->error < 0)
-                       goto err;
+               if (ret < 0)
+                       goto out;
                ct->status = CL_SENT_CH_RESPONSE;
                return;
                }
        case CL_SENT_CH_RESPONSE: /* read server response */
                {
                ct->status = CL_SENT_CH_RESPONSE;
                return;
                }
        case CL_SENT_CH_RESPONSE: /* read server response */
                {
-               size_t bytes_received;
-               ct->loaded = 0;
-               t->error = client_recv_buffer(ct);
-               if (t->error < 0)
-                       goto err;
-               bytes_received = t->error;
+               ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+               if (ret < 0 || n == 0)
+                       goto out;
                /* check if server has sent "Proceed" message */
                /* check if server has sent "Proceed" message */
-               t->error = -E_CLIENT_AUTH;
-               if (bytes_received < PROCEED_MSG_LEN)
-                       goto err;
-               if (!strstr(ct->buf, PROCEED_MSG))
-                       goto err;
+               ret = -E_CLIENT_AUTH;
+               if (n < PROCEED_MSG_LEN)
+                       goto out;
+               if (!strstr(buf, PROCEED_MSG))
+                       goto out;
                ct->status = CL_RECEIVED_PROCEED;
                ct->status = CL_RECEIVED_PROCEED;
-               t->error = 0;
                return;
                }
        case CL_RECEIVED_PROCEED: /* concat args and send command */
                {
                int i;
                char *command = NULL;
                return;
                }
        case CL_RECEIVED_PROCEED: /* concat args and send command */
                {
                int i;
                char *command = NULL;
+               if (!FD_ISSET(ct->rc4c.fd, &s->wfds))
+                       return;
                for (i = 0; i < ct->conf.inputs_num; i++) {
                        char *tmp = command;
                        command = make_message("%s\n%s", command?
                for (i = 0; i < ct->conf.inputs_num; i++) {
                        char *tmp = command;
                        command = make_message("%s\n%s", command?
@@ -230,40 +234,80 @@ static void client_post_select(struct sched *s, struct task *t)
                }
                command = para_strcat(command, EOC_MSG "\n");
                PARA_DEBUG_LOG("--> %s\n", command);
                }
                command = para_strcat(command, EOC_MSG "\n");
                PARA_DEBUG_LOG("--> %s\n", command);
-               t->error = rc4_send_buffer(&ct->rc4c, command);
+               ret = rc4_send_buffer(&ct->rc4c, command);
                free(command);
                free(command);
-               if (t->error < 0)
-                       goto err;
+               if (ret < 0)
+                       goto out;
                ct->status = CL_SENT_COMMAND;
                return;
                }
        case CL_SENT_COMMAND:
                ct->status = CL_SENT_COMMAND;
                return;
                }
        case CL_SENT_COMMAND:
-               ct->loaded = 0;
-               t->error = client_recv_buffer(ct);
-               if (t->error < 0)
-                       goto err;
-               if (strstr(ct->buf, AWAITING_DATA_MSG))
-                       ct->status = CL_SENDING;
-               else
+               {
+               char *buf2;
+               /* can not use "buf" here because we need a malloced buffer */
+               buf2 = para_malloc(CLIENT_BUFSIZE);
+               ret = client_recv_buffer(ct, &s->rfds, buf2, CLIENT_BUFSIZE, &n);
+               if (n > 0) {
+                       if (strstr(buf2, AWAITING_DATA_MSG)) {
+                               free(buf2);
+                               ct->status = CL_SENDING;
+                               return;
+                       }
                        ct->status = CL_RECEIVING;
                        ct->status = CL_RECEIVING;
-               return;
+                       btr_add_output(buf2, n, btrn);
+               } else
+                       free(buf2);
+               goto out;
+               }
        case CL_SENDING:
        case CL_SENDING:
-               PARA_INFO_LOG("loaded: %zd\n", *ct->in_loaded);
-               t->error = rc4_send_bin_buffer(&ct->rc4c, ct->inbuf,
-                       *ct->in_loaded);
-               if (t->error < 0)
-                       goto err;
-               *ct->in_loaded = 0;
+               {
+               char *buf2;
+               size_t sz;
+               ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+               if (ret < 0)
+                       goto out;
+               if (ret == 0)
+                       return;
+               if (!FD_ISSET(ct->rc4c.fd, &s->wfds))
+                       return;
+               sz = btr_next_buffer(btrn, &buf2);
+               ret = rc4_send_bin_buffer(&ct->rc4c, buf2, sz);
+               if (ret < 0)
+                       goto out;
+               btr_consume(btrn, sz);
                return;
                return;
+               }
        case CL_RECEIVING:
        case CL_RECEIVING:
-               t->error = client_recv_buffer(ct);
-               if (t->error < 0)
-                       goto err;
-               return;
+               {
+               char *buf2;
+               ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
+               if (ret < 0)
+                       goto out;
+               if (ret == 0)
+                       return;
+               /*
+                * The FD_ISSET() is not strictly necessary, but is allows us
+                * to skip the malloc below if there is nothing to read anyway.
+                */
+               if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
+                       return;
+               buf2 = para_malloc(CLIENT_BUFSIZE);
+               ret = client_recv_buffer(ct, &s->rfds, buf2, CLIENT_BUFSIZE, &n);
+               if (n > 0) {
+                       buf2 = para_realloc(buf2, n);
+                       btr_add_output(buf2, n, btrn);
+               } else
+                       free(buf2);
+               goto out;
+               }
+       }
+out:
+       t->error = ret;
+       if (ret < 0) {
+               if (ret != -E_SERVER_EOF && ret != -E_BTR_EOF)
+                       PARA_ERROR_LOG("%s\n", para_strerror(-t->error));
+               btr_remove_node(btrn);
        }
        }
-err:
-       if (t->error != -E_SERVER_EOF)
-               PARA_ERROR_LOG("%s\n", para_strerror(-t->error));
 }
 
 /* connect to para_server and register the client task */
 }
 
 /* connect to para_server and register the client task */
@@ -272,8 +316,8 @@ static int client_connect(struct client_task *ct)
        int ret;
 
        ct->rc4c.fd = -1;
        int ret;
 
        ct->rc4c.fd = -1;
-       ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, ct->conf.hostname_arg,
-               ct->conf.server_port_arg);
+       ret = para_connect_simple(IPPROTO_TCP, ct->conf.hostname_arg,
+                                              ct->conf.server_port_arg);
        if (ret < 0)
                return ret;
        ct->rc4c.fd = ret;
        if (ret < 0)
                return ret;
        ct->rc4c.fd = ret;
@@ -300,6 +344,8 @@ err_out:
  * \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.
  * \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.
+ * \param parent Add the new buffer tree node as a child of this node.
+ * \param child Add the new buffer tree node as a parent of this node.
  *
  * 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.
  *
  * 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.
@@ -308,13 +354,14 @@ err_out:
  * \return Standard.
  */
 int client_open(int argc, char *argv[], struct client_task **ct_ptr,
  * \return Standard.
  */
 int client_open(int argc, char *argv[], struct client_task **ct_ptr,
-               int *loglevel)
+               int *loglevel, struct btr_node *parent, struct btr_node *child)
 {
        char *home = para_homedir();
        int ret;
        struct client_task *ct = para_calloc(sizeof(struct client_task));
 
 {
        char *home = para_homedir();
        int ret;
        struct client_task *ct = para_calloc(sizeof(struct client_task));
 
-       ct->buf = para_malloc(CLIENT_BUFSIZE);
+       ct->btrn = btr_new_node(&(struct btr_node_description)
+               EMBRACE(.name = "client", .parent = parent, .child = child));
        *ct_ptr = ct;
        ct->rc4c.fd = -1;
        ret = -E_CLIENT_SYNTAX;
        *ct_ptr = ct;
        ct->rc4c.fd = -1;
        ret = -E_CLIENT_SYNTAX;
@@ -324,12 +371,6 @@ int client_open(int argc, char *argv[], struct client_task **ct_ptr,
        ret = -E_CLIENT_SYNTAX;
        if (!ct->conf.inputs_num)
                goto out;
        ret = -E_CLIENT_SYNTAX;
        if (!ct->conf.inputs_num)
                goto out;
-       ct->user = ct->conf.user_given?
-               para_strdup(ct->conf.user_arg) : para_logname();
-
-       ct->key_file = ct->conf.key_file_given?
-               para_strdup(ct->conf.key_file_arg) :
-               make_message("%s/.paraslash/key.%s", home, ct->user);
 
        ct->config_file = ct->conf.config_file_given?
                para_strdup(ct->conf.config_file_arg) :
 
        ct->config_file = ct->conf.config_file_given?
                para_strdup(ct->conf.config_file_arg) :
@@ -352,6 +393,13 @@ int client_open(int argc, char *argv[], struct client_task **ct_ptr,
                        &ct->conf, &params))
                        goto out;
        }
                        &ct->conf, &params))
                        goto out;
        }
+       ct->user = ct->conf.user_given?
+               para_strdup(ct->conf.user_arg) : para_logname();
+
+       ct->key_file = ct->conf.key_file_given?
+               para_strdup(ct->conf.key_file_arg) :
+               make_message("%s/.paraslash/key.%s", home, ct->user);
+
        if (loglevel)
                *loglevel = get_loglevel_by_name(ct->conf.loglevel_arg);
        PARA_INFO_LOG("loglevel: %s\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);
@@ -364,6 +412,8 @@ out:
        free(home);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        free(home);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+               btr_remove_node(ct->btrn);
+               btr_free_node(ct->btrn);
                client_close(ct);
                *ct_ptr = NULL;
        }
                client_close(ct);
                *ct_ptr = NULL;
        }