Remove ->init() of struct receiver.

[paraslash.git] / client.h

diff --git a/client.h b/client.h
index a423406238204c3ba9b86e066fc82fead3dc16d9..7ba56b9168c500bd4f596c5ba9db82ccef3347c5 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file client.h Common client functions and exported symbols from client_common.c. */
 
@@ -12,18 +8,18 @@ enum {
        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 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,
 };
 
 /** Data specific to a client task. */
@@ -32,27 +28,34 @@ struct client_task {
        int status;
        /** The file descriptor and the session keys. */
        struct stream_cipher_context scc;
-       /** True if this connections uses the sideband API. */
-       bool use_sideband;
-       /** The sideband context, ignored if \a use_sideband is false. */
-       struct sb_context *sbc;
-       /** The configuration (including the command). */
-       struct client_args_info conf;
-       /** The config file for client options. */
-       char *config_file;
+       /** 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 parsed command line (including the command). */
+       struct lls_parse_result *lpr;
        /** The RSA private key. */
        char *key_file;
        /** Paraslash user name. */
        char *user;
        /** The client task structure. */
-       struct task task;
-       /** The buffer tree node of the client task. */
-       struct btr_node *btrn;
+       struct task *task;
        /** List of features supported by the server. */
        char **features;
 };
 
-void client_disconnect(struct client_task *ct);
+#define CLIENT_CMD_PTR (lls_cmd(0, client_suite))
+#define CLIENT_OPT_RESULT(_name, _lpr) \
+       (lls_opt_result(LSG_CLIENT_PARA_CLIENT_OPT_ ## _name, _lpr))
+#define CLIENT_OPT_GIVEN(_name, _lpr) \
+       (lls_opt_given(CLIENT_OPT_RESULT(_name, _lpr)))
+#define CLIENT_OPT_UINT32_VAL(_name, _lpr) \
+       (lls_uint32_val(0, CLIENT_OPT_RESULT(_name, _lpr)))
+#define CLIENT_OPT_STRING_VAL(_name, _lpr) \
+       (lls_string_val(0, CLIENT_OPT_RESULT(_name, _lpr)))
+
 void client_close(struct client_task *ct);
 int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr,
                int *loglevel);