X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.h;h=fa965c354997ff9fef38ebba8b8220412ffeab84;hp=ca50ee05da1c4d0fde86d93f9222ad7d37c0a704;hb=35fb7de0ca7f871a6832d1041321d52af66fdf7b;hpb=a7d844e5f23805a7521cfd8bf573dd822351c895

diff --git a/client.h b/client.h
index ca50ee05..fa965c35 100644
--- a/client.h
+++ b/client.h
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 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 */
@@ -44,16 +32,17 @@ enum {
 	CL_RECEIVING,
 };
 
+/** size of the receiving buffer */
 #define CLIENT_BUFSIZE 8192
 
 /**
  * data specific to a client task
  */
-struct private_client_data {
+struct client_task {
 	/** the state of the connection */
 	int status;
-	/** the file descriptor */
-	int fd;
+	/** 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 */
@@ -62,16 +51,10 @@ struct private_client_data {
 	char *key_file;
 	/** paraslash user name */
 	char *user;
-	/** session key for receiving data */
-	RC4_KEY rc4_recv_key;
-	/** session key for sending data */
-	RC4_KEY rc4_send_key;
 	/** the client task structure */
 	struct task task;
-	/** non-zero if task is unregistered */
-	int eof;
 	/** the buffer used for handshake and receiving */
-	char buf[CLIENT_BUFSIZE];
+	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 */
@@ -84,11 +67,10 @@ struct private_client_data {
 	char *inbuf;
 	/** number of bytes loaded in \p inbuf */
 	size_t *in_loaded;
-	/** non-zero if input task encountered an eof or an errro condition */
-	int *in_eof;
+	/** Non-zero if input task encountered an eof or an error condition. */
+	int *in_error;
 };
 
-void client_close(struct private_client_data *pcd);
-int client_open(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,
+		int *loglevel);