Rewrote detach/resuming.

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

diff --git a/lib/silcclient/client_internal.h b/lib/silcclient/client_internal.h
index 3dbcd6729439b7193f6bf30bcfeea313d327e759..4478142ff8f7b2ecb1f3dd587449b540c608adbe 100644 (file)
--- a/lib/silcclient/client_internal.h
+++ b/lib/silcclient/client_internal.h
@@ -28,6 +28,7 @@
 #include "client_prvmsg.h"
 #include "client_channel.h"
 #include "client_notify.h"
+#include "client_keyagr.h"
 
 /****************************** Definitions *********************************/
 
@@ -41,6 +42,13 @@
 
 /********************************** Types ***********************************/
 
+/* Public key verification context */
+typedef struct {
+  SilcSKE ske;
+  SilcSKEVerifyCbCompletion completion;
+  void *completion_context;
+} *VerifyKeyContext;
+
 /* Context to hold the connection authentication request callbacks that
    will be called when the server has replied back to our request about
    current authentication method in the session. */
@@ -137,16 +145,19 @@ struct SilcClientInternalStruct {
   SilcMutex lock;                       /* Client lock */
   SilcList commands;                    /* Registered commands */
   char *silc_client_version;            /* Version set by application */
+  SilcClientRunning running;            /* Running/Stopped callback */
+  void *running_context;                /* Context for runnign callback */
+  SilcAtomic16 conns;                   /* Number of connections in client */
 
   /* Events */
-  unsigned int run_callback    : 1;     /* Call running callback */
+  unsigned int stop              : 1;   /* Stop client */
+  unsigned int run_callback      : 1;   /* Call running/stopped callback */
+  unsigned int connection_closed : 1;   /* A connection closed */
 };
 
 /* Internal context for conn->internal in SilcClientConnection. */
 struct SilcClientConnectionInternalStruct {
-  SilcIDCacheEntry local_entry;                 /* Local client cache entry */
   SilcClientConnectionParams params;    /* Connection parameters */
-
   SilcFSMStruct fsm;                    /* Connection FSM */
   SilcFSMThreadStruct event_thread;      /* FSM thread for events */
   SilcFSMSemaStruct wait_event;                 /* Event signaller */
@@ -161,6 +172,7 @@ struct SilcClientConnectionInternalStruct {
   SilcBuffer local_idp;                         /* Local ID Payload */
   SilcBuffer remote_idp;                /* Remote ID Payload */
   SilcAsyncOperation op;                /* Protocols async operation */
+  SilcAsyncOperation cop;               /* Async operation for application */
 
   SilcIDCache client_cache;             /* Client entry cache */
   SilcIDCache channel_cache;            /* Channel entry cache */
@@ -172,12 +184,15 @@ struct SilcClientConnectionInternalStruct {
 
   /* Events */
   unsigned int connect            : 1;  /* Connect remote host */
-  unsigned int disconnected       : 1;  /* Disconnected by remote host */
+  unsigned int disconnected       : 1;  /* Disconnect remote connection */
   unsigned int key_exchange       : 1;   /* Start key exchange */
+  unsigned int rekeying           : 1;   /* Start rekey */
 
   /* Flags */
   unsigned int verbose            : 1;   /* Notify application */
   unsigned int registering        : 1;  /* Set when registering to network */
+  unsigned int rekey_responder    : 1;   /* Set when rekeying as responder */
+  unsigned int callback_called    : 1;   /* Set when connect callback called */
 
   SilcClientAway *away;
   SilcClientConnAuthRequest connauth;
@@ -193,6 +208,7 @@ SILC_FSM_STATE(silc_client_connection_st_packet);
 SILC_FSM_STATE(silc_client_connection_st_close);
 SILC_FSM_STATE(silc_client_error);
 SILC_FSM_STATE(silc_client_disconnect);
+SILC_FSM_STATE(silc_client_st_stop);
 
 void silc_client_del_connection(SilcClient client, SilcClientConnection conn);
 SilcBool silc_client_del_client(SilcClient client, SilcClientConnection conn,
@@ -211,12 +227,11 @@ SilcUInt16 silc_client_command_send_argv(SilcClient client,
                                         SilcUInt32 *argv_lens,
                                         SilcUInt32 *argv_types);
 void silc_client_command_free(SilcClientCommandContext cmd);
+void silc_client_fsm_destructor(SilcFSM fsm, void *fsm_context,
+                               void *destructor_context);
 
 void silc_client_ftp(SilcClient client, SilcClientConnection conn,
                     SilcPacket packet);
-void silc_client_key_agreement(SilcClient client,
-                              SilcClientConnection conn,
-                              SilcPacket packet);
 void silc_client_connection_auth_request(SilcClient client,
                                         SilcClientConnection conn,
                                         SilcPacket packet);