X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.h;h=6e438f7ed15179da1817aea1c738712e229d7223;hp=b841b7e1b6b6d0698a404887429840f2ea6e9a47;hb=fb4022dfafa1d6f86f741767ecaed8e41c53352a;hpb=01a7db579a518a1a03b940a5a42411e49123ac1b

diff --git a/client.h b/client.h
index b841b7e1..6e438f7e 100644
--- a/client.h
+++ b/client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,7 +12,7 @@ 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,
@@ -20,12 +20,10 @@ enum {
 	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. */
@@ -34,10 +32,10 @@ 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 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). */
@@ -50,8 +48,6 @@ struct client_task {
 	char *user;
 	/** The client task structure. */
 	struct task task;
-	/** The buffer tree node of the client task. */
-	struct btr_node *btrn;
 	/** List of features supported by the server. */
 	char **features;
 };