audiod: Fix error checking in init_default_filters().

[paraslash.git] / client.h

diff --git a/client.h b/client.h
index 5fc336827f4ba187d7b6171a4daeb057806d865d..7ba56b9168c500bd4f596c5ba9db82ccef3347c5 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1,74 +1,66 @@
-/*
- * Copyright (C) 1997-2009 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 */
+/** \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
- */
+/** The different states of a connection from the view of the client. */
 enum {
-       /** tcp connection is established */
+       /** TCP connection is established. */
        CL_CONNECTED,
-       /** server sends the welcome message */
+       /** 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,
-       /** clientd solves the challenge and sends the result */
+       /** Client solves the challenge and sends the result. */
        CL_SENT_CH_RESPONSE,
-       /** server accepts this authentication */
+       /** 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,
 };
 
-/** size of the receiving buffer */
-#define CLIENT_BUFSIZE 8192
-
-/**
- * data specific to a client task
- */
+/** Data specific to a client task. */
 struct client_task {
-       /** the state of the connection */
+       /** The state of the connection. */
        int status;
-       /** The file descriptor and the rc4 keys. */
-       struct rc4_context rc4c;
-       /** the configuration (including the command) */
-       struct client_args_info conf;
-       /** the config file for client options */
-       char *config_file;
-       /** the RSA private key */
+       /** 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 parsed command line (including the command). */
+       struct lls_parse_result *lpr;
+       /** The RSA private key. */
        char *key_file;
-       /** paraslash user name */
+       /** 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 \p buf */
-       size_t loaded;
-       /** non-zero if the pre_select hook added \p fd to the read fd set */
-       int check_r;
-       /** non-zero if the pre_select hook added \p 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 \p inbuf */
-       size_t *in_loaded;
-       /** Non-zero if input task encountered an eof or an error condition. */
-       int *in_error;
+       /** The client task structure. */
+       struct task *task;
+       /** List of features supported by the server. */
+       char **features;
 };
 
+#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_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);