X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient.h;h=ebe41fe903f752ee261e14cd18edd51e7042adad;hb=90e14dc985628e0b0f86e604d511039d302dc956;hp=1a6da14ebbdd0547ccb7e7ad5364aa1665a663e9;hpb=03df183a5ada5bad0eed82b78d93ca6f4fd51213;p=silc.git

diff --git a/lib/silcclient/client.h b/lib/silcclient/client.h
index 1a6da14e..ebe41fe9 100644
--- a/lib/silcclient/client.h
+++ b/lib/silcclient/client.h
@@ -31,7 +31,6 @@ typedef struct SilcClientEntryStruct *SilcClientEntry;
 typedef struct SilcChannelEntryStruct *SilcChannelEntry;
 typedef struct SilcServerEntryStruct *SilcServerEntry;
 
-typedef struct SilcClientAwayStruct SilcClientAway;
 typedef struct SilcClientKeyAgreementStruct *SilcClientKeyAgreement;
 typedef struct SilcClientFtpSessionStruct *SilcClientFtpSession;
 typedef struct SilcClientCommandReplyContextStruct
@@ -42,9 +41,10 @@ typedef struct SilcClientConnectionInternalStruct
      *SilcClientConnectionInternal;
 typedef struct SilcChannelPrivateKeyStruct *SilcChannelPrivateKey;
 
-
 /* Internal client entry context */
 typedef struct SilcClientEntryInternalStruct {
+  void *prv_waiter;		/* Private message packet waiter */
+  SilcRwLock lock;		/* Read/write lock */
   SilcCipher send_key;		/* Private message key for sending */
   SilcCipher receive_key;	/* Private message key for receiving */
   SilcHmac hmac_send;		/* Private mesage key HMAC for sending */
@@ -54,17 +54,21 @@ typedef struct SilcClientEntryInternalStruct {
   SilcClientKeyAgreement ke;	/* Current key agreement context or NULL */
 
   /* Flags */
-  unsigned int valid       : 1;	/* FALSE if this entry is not valid */
-  unsigned int resolving   : 1; /* TRUE when entry is being resolved */
+  unsigned int valid       : 1;	/* FALSE if this entry is not valid.  Entry
+				   without nickname is not valid. */
   unsigned int generated   : 1; /* TRUE if library generated `key' */
   unsigned int prv_resp    : 1; /* TRUE if we are responder when using
 				   private message keys. */
   SilcUInt16 resolve_cmd_ident;	/* Command identifier when resolving */
-  SilcAtomic8 refcnt;		/* Reference counter */
+  SilcAtomic32 refcnt;		/* Reference counter */
+  SilcAtomic32 deleted;     /* Flag indicating whether the client object is
+									   already scheduled for deletion.*/
 } SilcClientEntryInternal;
 
 /* Internal channel entry context */
 typedef struct SilcChannelEntryInternalStruct {
+  SilcRwLock lock;		             /* Read/write lock */
+
   /* SilcChannelEntry status information */
   SilcDList old_channel_keys;
   SilcDList old_hmacs;
@@ -85,13 +89,16 @@ typedef struct SilcChannelEntryInternalStruct {
 						stuff that relates to the
 						channel. Not used for the
 						channel resolving itself. */
-  SilcAtomic16 refcnt;		             /* Reference counter */
+  SilcAtomic32 refcnt;		             /* Reference counter */
+  SilcAtomic32 deleted;     /* Flag indicating whether the channel object is
+									   already scheduled for deletion.*/
 } SilcChannelEntryInternal;
 
 /* Internal server entry context */
 typedef struct SilcServerEntryInternalStruct {
+  SilcRwLock lock;		             /* Read/write lock */
   SilcUInt16 resolve_cmd_ident;		     /* Resolving identifier */
-  SilcAtomic8 refcnt;		             /* Reference counter */
+  SilcAtomic32 refcnt;		             /* Reference counter */
 } SilcServerEntryInternal;
 
 #endif /* CLIENT_H */