Integer type name change.

[silc.git] / lib / silcclient / client.h

diff --git a/lib/silcclient/client.h b/lib/silcclient/client.h
index 2b40557b91296c9053ec432884e15ca7e7e53cc0..7868d4602e1c91ec44a6e4c70bffcc78d17e099f 100644 (file)
--- a/lib/silcclient/client.h
+++ b/lib/silcclient/client.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 2002 Pekka Riikonen
 
   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
@@ -21,27 +21,17 @@
 #define CLIENT_H
 
 /* Forward declarations */
-typedef struct SilcClientStruct *SilcClient;
 typedef struct SilcClientInternalStruct *SilcClientInternal;
-typedef struct SilcClientConnectionStruct *SilcClientConnection;
-typedef struct SilcClientPingStruct SilcClientPing;
-typedef struct SilcClientAwayStruct SilcClientAway;
-typedef struct SilcClientKeyAgreementStruct *SilcClientKeyAgreement;
-typedef struct SilcClientFtpSessionStruct *SilcClientFtpSession;
-
-#include "idlist.h"
-#include "command.h"
-#include "silcapi.h"
 
 /* Generic rekey context for connections */
 typedef struct {
   /* Current sending encryption key, provided for re-key. The `pfs'
      is TRUE if the Perfect Forward Secrecy is performed in re-key. */
   unsigned char *send_enc_key;
-  uint32 enc_key_len;
+  SilcUInt32 enc_key_len;
   int ske_group;
   bool pfs;
-  uint32 timeout;
+  SilcUInt32 timeout;
   void *context;
 } *SilcClientRekey;
 
@@ -68,7 +58,7 @@ struct SilcClientConnectionStruct {
   /* Decoded local ID so that the above defined ID would not have
      to be decoded for every packet. */
   unsigned char *local_id_data;
-  uint32 local_id_data_len;
+  SilcUInt32 local_id_data_len;
 
   /* Own client entry. */
   SilcClientEntry local_entry;
@@ -87,7 +77,7 @@ struct SilcClientConnectionStruct {
   /* Decoded remote ID so that the above defined ID would not have
      to be decoded for every packet. */
   unsigned char *remote_id_data;
-  uint32 remote_id_data_len;
+  SilcUInt32 remote_id_data_len;
 
   /*
    * Common data 
@@ -98,8 +88,8 @@ struct SilcClientConnectionStruct {
   SilcHmac hmac_send;
   SilcHmac hmac_receive;
   SilcHash hash;
-  uint32 psn_send;
-  uint32 psn_receive;
+  SilcUInt32 psn_send;
+  SilcUInt32 psn_receive;
 
   /* Client ID and Channel ID cache. Messages transmitted in SILC network
      are done using different unique ID's. These are the cache for
@@ -121,11 +111,11 @@ struct SilcClientConnectionStruct {
   SilcDList pending_commands;
 
   /* Current command identifier, 0 not used */
-  uint16 cmd_ident;
+  SilcUInt16 cmd_ident;
 
   /* Requested pings. */
   SilcClientPing *ping;
-  uint32 ping_count;
+  SilcUInt32 ping_count;
 
   /* Set away message */
   SilcClientAway *away;
@@ -138,7 +128,7 @@ struct SilcClientConnectionStruct {
 
   /* File transmission sessions */
   SilcDList ftp_sessions;
-  uint32 next_session_id;
+  SilcUInt32 next_session_id;
   SilcClientFtpSession active_session;
 
   /* Pointer back to the SilcClient. This object is passed to the application
@@ -152,6 +142,7 @@ struct SilcClientConnectionStruct {
 /* Main client structure. */
 struct SilcClientStruct {
   char *username;              /* Username, must be set by application */
+  char *nickname;              /* Nickname, may be set by application  */
   char *hostname;              /* hostname, must be set by application */
   char *realname;              /* Real name, must be set be application */