client: Fix return value check for sb_received().

[paraslash.git] / client.h

diff --git a/client.h b/client.h
index 98dc32db5fdd547db412836e2f0925436064c3e7..2f257221510b1cb0b0848eb615d1dfb894f0cc81 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \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. */
+       /** Client sends the authentication request. */
        CL_SENT_AUTH,
-       /** Server sends a challenge. */
+       /** Server sends encrypted challenge. */
        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,
-       /** Server expects data. */
+       /** Command is executing. */
+       CL_EXECUTING,
+       /** Server is expecting data (addblob commands only). */
        CL_SENDING,
-       /** Client expects data. */
-       CL_RECEIVING,
 };
 
-/** The size of the receiving buffer. */
-#define CLIENT_BUFSIZE 8192
-
 /** Data specific to a client task. */
 struct client_task {
        /** The state of the connection. */
        int status;
-       /** The file descriptor and the rc4 keys. */
-       struct rc4_context rc4c;
+       /** The file descriptor and the session keys. */
+       struct stream_cipher_context scc;
+       /** The sideband contexts for receiving/sending. */
+       struct sb_context *sbc[2];
+       /** The buffer tree nodes for receiving/sending. */
+       struct btr_node *btrn[2];
+       /** The hash value of the decrypted challenge. */
+       unsigned char *challenge_hash;
        /** The configuration (including the command). */
        struct client_args_info conf;
        /** The config file for client options. */
@@ -48,23 +47,16 @@ struct client_task {
        /** Paraslash user name. */
        char *user;
        /** The client task structure. */
-       struct task task;
-       /** The buffer used for handshake and receiving. */
-       char *buf;
-       /** Number of bytes loaded in \a buf. */
-       size_t loaded;
-       /** Non-zero if the pre_select hook added \a fd to the read fd set. */
-       int check_r;
-       /** Non-zero if the pre_select hook added \a fd to the write fd set. */
-       int check_w;
-       /** Pointer to the data to be sent to para_server. */
-       char *inbuf;
-       /** Number of bytes loaded in \a inbuf. */
-       size_t *in_loaded;
-       /** Non-zero if input task encountered an eof or an error condition. */
-       int *in_error;
+       struct task *task;
+       /** List of features supported by the server. */
+       char **features;
 };
 
 void client_close(struct client_task *ct);
-int client_open(int argc, char *argv[], struct client_task **ct,
+int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr,
                int *loglevel);
+int client_connect(struct client_task *ct, struct sched *s,
+               struct btr_node *parent, struct btr_node *child);
+int client_open(int argc, char *argv[], struct client_task **ct_ptr,
+               int *loglevel, struct btr_node *parent, struct btr_node *child,
+               struct sched *sched);