X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.h;h=fa965c354997ff9fef38ebba8b8220412ffeab84;hp=dcec361129b3cbe0223bbe80dfbdfbc2e3f17eac;hb=8b0ab0837ecdd5d28c7b6f31a605552f6942ca64;hpb=335730538150250f32c0df0b184fb494e2bb0df3;ds=sidebyside diff --git a/client.h b/client.h index dcec3611..fa965c35 100644 --- a/client.h +++ b/client.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2008 Andre Noll + * Copyright (C) 1997-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -41,8 +41,8 @@ enum { 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 */ @@ -51,14 +51,10 @@ struct client_task { 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; /** 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 */ @@ -76,4 +72,5 @@ struct client_task { }; void client_close(struct client_task *ct); -int client_open(int argc, char *argv[], struct client_task **ct); +int client_open(int argc, char *argv[], struct client_task **ct, + int *loglevel);