stream cipher: Allow in-place encryption.

[paraslash.git] / client.h

diff --git a/client.h b/client.h
index 8f7b9a5dc1b47d4783da5ead2274cd87607a296f..2d63c4109460764d4fa5e3a6aa9c694044775afb 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1,63 +1,50 @@
 /*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file client.h common client functions and exported symbols from client_common.c */
+/** \file client.h Common client functions and exported symbols from client_common.c. */
 
-#include <openssl/rc4.h>
+/** The different states of a connection from the view of the client. */
 enum {
+       /** TCP connection is established. */
        CL_CONNECTED,
+       /** Server sends the welcome message. */
        CL_RECEIVED_WELCOME,
+       /** Client sends the authentification request. */
        CL_SENT_AUTH,
-       CL_RECEIVED_CHALLENGE,
+       /** Client solves the challenge and sends the result. */
        CL_SENT_CH_RESPONSE,
+       /** Server accepts this authentication. */
        CL_RECEIVED_PROCEED,
+       /** Client sends the command. */
        CL_SENT_COMMAND,
-       CL_SENDING_STDIN,
-       CL_RECEIVING_SERVER_OUTPUT
+       /** Server expects data. */
+       CL_SENDING,
+       /** Client expects data. */
+       CL_RECEIVING,
 };
 
-#define CLIENT_BUFSIZE 8192
-
-struct private_client_data {
+/** Data specific to a client task. */
+struct client_task {
+       /** The state of the connection. */
        int status;
-       int fd;
+       /** The file descriptor and the session keys. */
+       struct stream_cipher_context scc;
+       /** The configuration (including the command). */
        struct client_args_info conf;
+       /** The config file for client options. */
        char *config_file;
+       /** The RSA private key. */
        char *key_file;
+       /** Paraslash user name. */
        char *user;
-       RC4_KEY rc4_recv_key;
-       RC4_KEY rc4_send_key;
+       /** The client task structure. */
        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;
-       int *in_eof;
+       struct btr_node *btrn;
 };
 
-int client_open(struct private_client_data *pcd);
-void client_close(struct private_client_data *pcd);
-int client_parse_config(int argc, char *argv[],
-       struct private_client_data **pcd_ptr);
-void client_pre_select(struct sched *s, struct task *t);
-void client_post_select(struct sched *s, struct task *t);
+void client_close(struct client_task *ct);
+int client_open(int argc, char *argv[], struct client_task **ct_ptr,
+               int *loglevel, struct btr_node *parent, struct btr_node *child);