Mon Jun 18 22:21:37 CEST 2007 Jochen Eisinger <coffee@silcnet.org>
[silc.git] / lib / silcclient / client.c
index 9354d28d6c6e3b641a94dc0fe396cb2dd2477e4c..154de47819ff7dcbca86f7051f663dd3af400718 100644 (file)
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2006 Pekka Riikonen
+  Copyright (C) 1997 - 2005 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
 */
 /* $Id$ */
 
-#include "silc.h"
+#include "silcincludes.h"
 #include "silcclient.h"
 #include "client_internal.h"
 
-/************************** Types and definitions ***************************/
+/* Static task callback prototypes */
+SILC_TASK_CALLBACK(silc_client_connect_to_server_start);
+SILC_TASK_CALLBACK(silc_client_connect_to_server_second);
+SILC_TASK_CALLBACK(silc_client_connect_to_server_final);
+SILC_TASK_CALLBACK(silc_client_rekey_final);
+
+static bool silc_client_packet_parse(SilcPacketParserContext *parser_context,
+                                    void *context);
+static void silc_client_packet_parse_type(SilcClient client,
+                                         SilcSocketConnection sock,
+                                         SilcPacketContext *packet);
+void silc_client_resolve_auth_method(bool success,
+                                    SilcProtocolAuthMeth auth_meth,
+                                    const unsigned char *auth_data,
+                                    SilcUInt32 auth_data_len, void *context);
 
+/* Allocates new client object. This has to be done before client may
+   work. After calling this one must call silc_client_init to initialize
+   the client. The `application' is application specific user data pointer
+   and caller must free it. */
 
-/************************ Static utility functions **************************/
+SilcClient silc_client_alloc(SilcClientOperations *ops,
+                            SilcClientParams *params,
+                            void *application,
+                            const char *version_string)
+{
+  SilcClient new_client;
 
-/* Connection machine FSM destructor.  This will finish the thread where
-   the machine was running and deletes the connection context. */
+  new_client = silc_calloc(1, sizeof(*new_client));
+  new_client->application = application;
 
-static void silc_client_connection_destructor(SilcFSM fsm,
-                                             void *fsm_context,
-                                             void *destructor_context)
-{
-  SilcClientConnection conn = fsm_context;
-  SilcFSMThread thread = destructor_context;
+  new_client->internal = silc_calloc(1, sizeof(*new_client->internal));
+  new_client->internal->ops = ops;
+  new_client->internal->params =
+    silc_calloc(1, sizeof(*new_client->internal->params));
+  if (!version_string)
+    version_string = silc_version_string;
+  new_client->internal->silc_client_version = strdup(version_string);
+
+  if (params)
+    memcpy(new_client->internal->params, params, sizeof(*params));
+
+  if (!new_client->internal->params->task_max)
+    new_client->internal->params->task_max = 200;
+
+  if (!new_client->internal->params->rekey_secs)
+    new_client->internal->params->rekey_secs = 3600;
 
-  /* Delete connection */
-  silc_client_del_connection(conn->client, conn);
+  if (!new_client->internal->params->connauth_request_secs)
+    new_client->internal->params->connauth_request_secs = 2;
 
-  /* Finish the thread were this machine was running */
-  silc_fsm_finish(thread);
+  new_client->internal->params->
+    nickname_format[sizeof(new_client->internal->
+                          params->nickname_format) - 1] = 0;
+
+  return new_client;
 }
 
-/* Packet FSM thread destructor */
+/* Frees client object and its internals. */
 
-static void silc_client_packet_destructor(SilcFSMThread thread,
-                                         void *thread_context,
-                                         void *destructor_context)
+void silc_client_free(SilcClient client)
 {
-  SilcClientConnection conn = thread_context;
+  if (client) {
+    if (client->rng)
+      silc_rng_free(client->rng);
+
+    if (!client->internal->params->dont_register_crypto_library) {
+      silc_cipher_unregister_all();
+      silc_pkcs_unregister_all();
+      silc_hash_unregister_all();
+      silc_hmac_unregister_all();
+    }
 
-  /* Add thread back to thread pool */
-  silc_list_add(conn->internal->thread_pool, thread);
-  if (silc_list_count(conn->internal->thread_pool) == 1)
-    silc_list_start(conn->internal->thread_pool);
+    silc_hash_free(client->md5hash);
+    silc_hash_free(client->sha1hash);
+    silc_hmac_free(client->internal->md5hmac);
+    silc_hmac_free(client->internal->sha1hmac);
+    silc_cipher_free(client->internal->none_cipher);
+    silc_free(client->internal->params);
+    silc_free(client->internal->silc_client_version);
+    silc_free(client->internal);
+    silc_free(client);
+  }
 }
 
-/* Packet engine callback to receive a packet */
+/* Initializes the client. This makes all the necessary steps to make
+   the client ready to be run. One must call silc_client_run to run the
+   client. Returns FALSE if error occured, TRUE otherwise. */
 
-static SilcBool silc_client_packet_receive(SilcPacketEngine engine,
-                                          SilcPacketStream stream,
-                                          SilcPacket packet,
-                                          void *callback_context,
-                                          void *stream_context)
+bool silc_client_init(SilcClient client)
 {
-  SilcClientConnection conn = stream_context;
-  SilcFSMThread thread;
+  SILC_LOG_DEBUG(("Initializing client"));
 
-  /* Packets we do not handle */
-  switch (packet->type) {
-  case SILC_PACKET_HEARTBEAT:
-  case SILC_PACKET_SUCCESS:
-  case SILC_PACKET_FAILURE:
-  case SILC_PACKET_REJECT:
-  case SILC_PACKET_KEY_EXCHANGE:
-  case SILC_PACKET_KEY_EXCHANGE_1:
-  case SILC_PACKET_KEY_EXCHANGE_2:
-  case SILC_PACKET_REKEY:
-  case SILC_PACKET_REKEY_DONE:
-  case SILC_PACKET_CONNECTION_AUTH:
-  case SILC_PACKET_CONNECTION_AUTH_REQUEST:
+  assert(client);
+  assert(client->username);
+  assert(client->hostname);
+  assert(client->realname);
+
+  /* Validate essential strings */
+  if (client->nickname)
+    if (!silc_identifier_verify(client->nickname, strlen(client->nickname),
+                               SILC_STRING_UTF8, 128)) {
+      SILC_LOG_ERROR(("Malformed nickname '%s'", client->nickname));
+      return FALSE;
+    }
+  if (!silc_identifier_verify(client->username, strlen(client->username),
+                             SILC_STRING_UTF8, 128)) {
+    SILC_LOG_ERROR(("Malformed username '%s'", client->username));
+    return FALSE;
+  }
+  if (!silc_identifier_verify(client->hostname, strlen(client->hostname),
+                             SILC_STRING_UTF8, 256)) {
+    SILC_LOG_ERROR(("Malformed hostname '%s'", client->hostname));
+    return FALSE;
+  }
+  if (!silc_utf8_valid(client->realname, strlen(client->realname))) {
+    SILC_LOG_ERROR(("Malformed realname '%s'", client->realname));
     return FALSE;
-    break;
   }
 
-  /* Get packet processing thread */
-  thread = silc_list_get(conn->internal->thread_pool);
-  if (!thread) {
-    thread = silc_fsm_thread_alloc(&conn->internal->fsm, conn,
-                                  silc_client_packet_destructor, NULL, FALSE);
-    if (!thread)
-      return FALSE;
-  } else {
-    silc_list_del(conn->internal->thread_pool, thread);
-    silc_fsm_thread_init(thread, &conn->internal->fsm, conn,
-                        silc_client_packet_destructor, NULL, FALSE);
-  }
+  if (!client->internal->params->dont_register_crypto_library) {
+    /* Initialize the crypto library.  If application has done this already
+       this has no effect.  Also, we will not be overriding something
+       application might have registered earlier. */
+    silc_cipher_register_default();
+    silc_pkcs_register_default();
+    silc_hash_register_default();
+    silc_hmac_register_default();
+  }
+
+  /* Initialize hash functions for client to use */
+  silc_hash_alloc("md5", &client->md5hash);
+  silc_hash_alloc("sha1", &client->sha1hash);
+
+  /* Initialize none cipher */
+  silc_cipher_alloc("none", &client->internal->none_cipher);
+
+  /* Initialize random number generator */
+  client->rng = silc_rng_alloc();
+  silc_rng_init(client->rng);
+  silc_rng_global_init(client->rng);
+
+  /* Register protocols */
+  silc_client_protocols_register();
+
+  /* Initialize the scheduler */
+  client->schedule =
+    silc_schedule_init(client->internal->params->task_max ?
+                      client->internal->params->task_max : 200, client);
+  if (!client->schedule)
+    return FALSE;
+
+  /* Register commands */
+  silc_client_commands_register(client);
+
+  return TRUE;
+}
+
+/* Stops the client. This is called to stop the client and thus to stop
+   the program. */
+
+void silc_client_stop(SilcClient client)
+{
+  SILC_LOG_DEBUG(("Stopping client"));
+
+  silc_schedule_stop(client->schedule);
+  silc_schedule_uninit(client->schedule);
+
+  silc_client_protocols_unregister();
+  silc_client_commands_unregister(client);
+
+  SILC_LOG_DEBUG(("Client stopped"));
+}
+
+/* Runs the client. This starts the scheduler from the utility library.
+   When this functions returns the execution of the appliation is over. */
+
+void silc_client_run(SilcClient client)
+{
+  SILC_LOG_DEBUG(("Running client"));
+
+  assert(client);
+  assert(client->pkcs);
+  assert(client->public_key);
+  assert(client->private_key);
+
+  /* Start the scheduler, the heart of the SILC client. When this returns
+     the program will be terminated. */
+  silc_schedule(client->schedule);
+}
+
+/* Runs the client and returns immeadiately. This function is used when
+   the SILC Client object indicated by the `client' is run under some
+   other scheduler, or event loop or main loop.  On GUI applications,
+   for example this may be desired to use to run the client under the
+   GUI application's main loop.  Typically the GUI application would
+   register an idle task that calls this function multiple times in
+   a second to quickly process the SILC specific data. */
+
+void silc_client_run_one(SilcClient client)
+{
+  /* Run the scheduler once. */
+  silc_schedule_one(client->schedule, 0);
+}
+
+/* Allocates and adds new connection to the client. This adds the allocated
+   connection to the connection table and returns a pointer to it. A client
+   can have multiple connections to multiple servers. Every connection must
+   be added to the client using this function. User data `context' may
+   be sent as argument. This function is normally used only if the
+   application performed the connecting outside the library. The library
+   however may use this internally. */
+
+SilcClientConnection
+silc_client_add_connection(SilcClient client,
+                           SilcClientConnectionParams *params,
+                           char *hostname, int port, void *context)
+{
+  SilcClientConnection conn;
+  int i;
+
+  SILC_LOG_DEBUG(("Adding new connection to %s:%d", hostname, port));
+
+  conn = silc_calloc(1, sizeof(*conn));
+  conn->internal = silc_calloc(1, sizeof(*conn->internal));
+
+  /* Initialize ID caches */
+  conn->client = client;
+  conn->remote_host = strdup(hostname);
+  conn->remote_port = port;
+  conn->context = context;
+  conn->internal->client_cache =
+    silc_idcache_alloc(0, SILC_ID_CLIENT, NULL, NULL, FALSE, TRUE);
+  conn->internal->channel_cache = silc_idcache_alloc(0, SILC_ID_CHANNEL, NULL,
+                                                    NULL, FALSE, TRUE);
+  conn->internal->server_cache = silc_idcache_alloc(0, SILC_ID_SERVER, NULL,
+                                                   NULL, FALSE, TRUE);
+  conn->internal->pending_commands = silc_dlist_init();
+  conn->internal->ftp_sessions = silc_dlist_init();
+
+  if (params) {
+    if (params->detach_data)
+      conn->internal->params.detach_data =
+       silc_memdup(params->detach_data,
+                   params->detach_data_len);
+    conn->internal->params.detach_data_len = params->detach_data_len;
+  }
+
+  /* Add the connection to connections table */
+  for (i = 0; i < client->internal->conns_count; i++)
+    if (client->internal->conns && !client->internal->conns[i]) {
+      client->internal->conns[i] = conn;
+      return conn;
+    }
+
+  client->internal->conns =
+    silc_realloc(client->internal->conns, sizeof(*client->internal->conns)
+                * (client->internal->conns_count + 1));
+  client->internal->conns[client->internal->conns_count] = conn;
+  client->internal->conns_count++;
+
+  return conn;
+}
+
+/* Removes connection from client. Frees all memory. */
+
+void silc_client_del_connection(SilcClient client, SilcClientConnection conn)
+{
+  int i;
+
+  for (i = 0; i < client->internal->conns_count; i++)
+    if (client->internal->conns[i] == conn) {
+      /* Free all cache entries */
+      SilcIDCacheList list;
+      SilcIDCacheEntry entry;
+      SilcClientCommandPending *r;
+      bool ret;
+
+      if (silc_idcache_get_all(conn->internal->client_cache, &list)) {
+       ret = silc_idcache_list_first(list, &entry);
+       while (ret) {
+         silc_client_del_client(client, conn, entry->context);
+         ret = silc_idcache_list_next(list, &entry);
+       }
+       silc_idcache_list_free(list);
+      }
+
+      if (silc_idcache_get_all(conn->internal->channel_cache, &list)) {
+       ret = silc_idcache_list_first(list, &entry);
+       while (ret) {
+         silc_client_del_channel(client, conn, entry->context);
+         ret = silc_idcache_list_next(list, &entry);
+       }
+       silc_idcache_list_free(list);
+      }
+
+      if (silc_idcache_get_all(conn->internal->server_cache, &list)) {
+       ret = silc_idcache_list_first(list, &entry);
+       while (ret) {
+         silc_client_del_server(client, conn, entry->context);
+         ret = silc_idcache_list_next(list, &entry);
+       }
+       silc_idcache_list_free(list);
+      }
+
+      /* Clear ID caches */
+      if (conn->internal->client_cache)
+       silc_idcache_free(conn->internal->client_cache);
+      if (conn->internal->channel_cache)
+       silc_idcache_free(conn->internal->channel_cache);
+      if (conn->internal->server_cache)
+       silc_idcache_free(conn->internal->server_cache);
+
+      /* Free data (my ID is freed in above silc_client_del_client).
+        conn->nickname is freed when freeing the local_entry->nickname. */
+      silc_free(conn->remote_host);
+      silc_free(conn->local_id_data);
+      if (conn->internal->send_key)
+       silc_cipher_free(conn->internal->send_key);
+      if (conn->internal->receive_key)
+       silc_cipher_free(conn->internal->receive_key);
+      if (conn->internal->hmac_send)
+       silc_hmac_free(conn->internal->hmac_send);
+      if (conn->internal->hmac_receive)
+       silc_hmac_free(conn->internal->hmac_receive);
+      silc_free(conn->internal->rekey);
+
+      if (conn->internal->active_session) {
+       if (conn->sock)
+         conn->sock->user_data = NULL;
+       silc_client_ftp_session_free(conn->internal->active_session);
+       conn->internal->active_session = NULL;
+      }
+
+      silc_client_ftp_free_sessions(client, conn);
+
+      if (conn->internal->pending_commands) {
+       silc_dlist_start(conn->internal->pending_commands);
+       while ((r = silc_dlist_get(conn->internal->pending_commands))
+              != SILC_LIST_END)
+         silc_dlist_del(conn->internal->pending_commands, r);
+       silc_dlist_uninit(conn->internal->pending_commands);
+      }
+
+      silc_free(conn->internal);
+      memset(conn, 0, sizeof(*conn));
+      silc_free(conn);
+
+      client->internal->conns[i] = NULL;
+    }
+}
+
+/* Adds listener socket to the listener sockets table. This function is
+   used to add socket objects that are listeners to the client.  This should
+   not be used to add other connection objects. */
+
+void silc_client_add_socket(SilcClient client, SilcSocketConnection sock)
+{
+  int i;
+
+  if (!client->internal->sockets) {
+    client->internal->sockets =
+      silc_calloc(1, sizeof(*client->internal->sockets));
+    client->internal->sockets[0] = silc_socket_dup(sock);
+    client->internal->sockets_count = 1;
+    return;
+  }
+
+  for (i = 0; i < client->internal->sockets_count; i++) {
+    if (client->internal->sockets[i] == NULL) {
+      client->internal->sockets[i] = silc_socket_dup(sock);
+      return;
+    }
+  }
+
+  client->internal->sockets =
+    silc_realloc(client->internal->sockets,
+                sizeof(*client->internal->sockets) *
+                (client->internal->sockets_count + 1));
+  client->internal->sockets[client->internal->sockets_count] =
+    silc_socket_dup(sock);
+  client->internal->sockets_count++;
+}
+
+/* Deletes listener socket from the listener sockets table. */
+
+void silc_client_del_socket(SilcClient client, SilcSocketConnection sock)
+{
+  int i;
+
+  if (!client->internal->sockets)
+    return;
+
+  for (i = 0; i < client->internal->sockets_count; i++) {
+    if (client->internal->sockets[i] == sock) {
+      silc_socket_free(sock);
+      client->internal->sockets[i] = NULL;
+      return;
+    }
+  }
+}
+
+static int
+silc_client_connect_to_server_internal(SilcClientInternalConnectContext *ctx)
+{
+  int sock;
+
+  /* XXX In the future we should give up this non-blocking connect all
+     together and use threads instead. */
+  /* Create connection to server asynchronously */
+  sock = silc_net_create_connection_async(NULL, ctx->port, ctx->host);
+  if (sock < 0)
+    return -1;
+
+  /* Register task that will receive the async connect and will
+     read the result. */
+  ctx->task = silc_schedule_task_add(ctx->client->schedule, sock,
+                                    silc_client_connect_to_server_start,
+                                    (void *)ctx, 0, 0,
+                                    SILC_TASK_FD,
+                                    SILC_TASK_PRI_NORMAL);
+  silc_schedule_set_listen_fd(ctx->client->schedule, sock, SILC_TASK_WRITE,
+                             FALSE);
+
+  ctx->sock = sock;
+
+  return sock;
+}
+
+/* Connects to remote server. This is the main routine used to connect
+   to SILC server. Returns -1 on error and the created socket otherwise.
+   The `context' is user context that is saved into the SilcClientConnection
+   that is created after the connection is created. Note that application
+   may handle the connecting process outside the library. If this is the
+   case then this function is not used at all. When the connecting is
+   done the `connect' client operation is called. */
+
+int silc_client_connect_to_server(SilcClient client,
+                                 SilcClientConnectionParams *params,
+                                 int port, char *host, void *context)
+{
+  SilcClientInternalConnectContext *ctx;
+  SilcClientConnection conn;
+  int sock;
+
+  SILC_LOG_DEBUG(("Connecting to port %d of server %s",
+                 port, host));
+
+  conn = silc_client_add_connection(client, params, host, port, context);
+
+  client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT,
+                            "Connecting to port %d of server %s", port, host);
+
+  /* Allocate internal context for connection process. This is
+     needed as we are doing async connecting. */
+  ctx = silc_calloc(1, sizeof(*ctx));
+  ctx->client = client;
+  ctx->conn = conn;
+  ctx->host = strdup(host);
+  ctx->port = port ? port : 706;
+  ctx->tries = 0;
+
+  /* Do the actual connecting process */
+  sock = silc_client_connect_to_server_internal(ctx);
+  if (sock == -1)
+    silc_client_del_connection(client, conn);
+  return sock;
+}
+
+/* Socket hostname and IP lookup callback that is called before actually
+   starting the key exchange.  The lookup is called from the function
+   silc_client_start_key_exchange. */
+
+static void silc_client_start_key_exchange_cb(SilcSocketConnection sock,
+                                             void *context)
+{
+  SilcClientConnection conn = (SilcClientConnection)context;
+  SilcClient client = conn->client;
+  SilcProtocol protocol;
+  SilcClientKEInternalContext *proto_ctx;
+
+  SILC_LOG_DEBUG(("Start"));
+
+  if (conn->sock->hostname) {
+    silc_free(conn->remote_host);
+    conn->remote_host = strdup(conn->sock->hostname);
+  } else {
+    conn->sock->hostname = strdup(conn->remote_host);
+  }
+  if (!conn->sock->ip)
+    conn->sock->ip = strdup(conn->sock->hostname);
+  conn->sock->port = conn->remote_port;
+
+  /* Allocate internal Key Exchange context. This is sent to the
+     protocol as context. */
+  proto_ctx = silc_calloc(1, sizeof(*proto_ctx));
+  proto_ctx->client = (void *)client;
+  proto_ctx->sock = silc_socket_dup(conn->sock);
+  proto_ctx->rng = client->rng;
+  proto_ctx->responder = FALSE;
+  proto_ctx->send_packet = silc_client_protocol_ke_send_packet;
+  proto_ctx->verify = silc_client_protocol_ke_verify_key;
+
+  /* Perform key exchange protocol. silc_client_connect_to_server_final
+     will be called after the protocol is finished. */
+  silc_protocol_alloc(SILC_PROTOCOL_CLIENT_KEY_EXCHANGE,
+                     &protocol, (void *)proto_ctx,
+                     silc_client_connect_to_server_second);
+  if (!protocol) {
+    client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_ERROR,
+                              "Error: Could not start key exchange protocol");
+    silc_net_close_connection(conn->sock->sock);
+    client->internal->ops->connected(client, conn, SILC_CLIENT_CONN_ERROR);
+    return;
+  }
+  conn->sock->protocol = protocol;
+
+  /* Register the connection for network input and output. This sets
+     that scheduler will listen for incoming packets for this connection
+     and sets that outgoing packets may be sent to this connection as well.
+     However, this doesn't set the scheduler for outgoing traffic, it will
+     be set separately by calling SILC_CLIENT_SET_CONNECTION_FOR_OUTPUT,
+     later when outgoing data is available. */
+  context = (void *)client;
+  SILC_CLIENT_REGISTER_CONNECTION_FOR_IO(conn->sock->sock);
+
+  /* Execute the protocol */
+  silc_protocol_execute(protocol, client->schedule, 0, 0);
+}
+
+/* Start SILC Key Exchange (SKE) protocol to negotiate shared secret
+   key material between client and server.  This function can be called
+   directly if application is performing its own connecting and does not
+   use the connecting provided by this library. This function is normally
+   used only if the application performed the connecting outside the library.
+   The library however may use this internally. */
+
+void silc_client_start_key_exchange(SilcClient client,
+                                   SilcClientConnection conn,
+                                   int fd)
+{
+  assert(client->pkcs);
+  assert(client->public_key);
+  assert(client->private_key);
+
+  /* Allocate new socket connection object */
+  silc_socket_alloc(fd, SILC_SOCKET_TYPE_SERVER, (void *)conn, &conn->sock);
+
+  /* Sometimes when doing quick reconnects the new socket may be same as
+     the old one and there might be pending stuff for the old socket.
+     If new one is same then those pending sutff might cause problems.
+     Make sure they do not do that. */
+  silc_schedule_task_del_by_fd(client->schedule, fd);
+
+  conn->nickname = (client->nickname ? strdup(client->nickname) :
+                   strdup(client->username));
+
+  /* Resolve the remote hostname and IP address for our socket connection */
+  silc_socket_host_lookup(conn->sock, FALSE, silc_client_start_key_exchange_cb,
+                         conn, client->schedule);
+}
+
+/* Callback called when error has occurred during connecting (KE) to
+   the server.  The `connect' client operation will be called. */
+
+SILC_TASK_CALLBACK(silc_client_connect_failure)
+{
+  SilcClientKEInternalContext *ctx =
+    (SilcClientKEInternalContext *)context;
+  SilcClient client = (SilcClient)ctx->client;
+
+  client->internal->ops->connected(client, ctx->sock->user_data,
+                                  SILC_CLIENT_CONN_ERROR_KE);
+  if (ctx->packet)
+    silc_packet_context_free(ctx->packet);
+  silc_free(ctx);
+}
+
+/* Callback called when error has occurred during connecting (auth) to
+   the server.  The `connect' client operation will be called. */
+
+SILC_TASK_CALLBACK(silc_client_connect_failure_auth)
+{
+  SilcClientConnAuthInternalContext *ctx =
+    (SilcClientConnAuthInternalContext *)context;
+  SilcClient client = (SilcClient)ctx->client;
+
+  client->internal->ops->connected(client, ctx->sock->user_data, ctx->status);
+  silc_free(ctx);
+}
+
+/* Start of the connection to the remote server. This is called after
+   succesful TCP/IP connection has been established to the remote host. */
+
+SILC_TASK_CALLBACK(silc_client_connect_to_server_start)
+{
+  SilcClientInternalConnectContext *ctx =
+    (SilcClientInternalConnectContext *)context;
+  SilcClient client = ctx->client;
+  SilcClientConnection conn = ctx->conn;
+  int opt, opt_len = sizeof(opt);
+
+  SILC_LOG_DEBUG(("Start"));
+
+  /* Check the socket status as it might be in error */
+  silc_net_get_socket_opt(fd, SOL_SOCKET, SO_ERROR, &opt, &opt_len);
+  if (opt != 0) {
+    if (ctx->tries < 2) {
+      /* Connection failed but lets try again */
+      client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_ERROR,
+                                "Could not connect to server %s: %s",
+                                ctx->host, strerror(opt));
+      client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT,
+                                "Connecting to port %d of server %s resumed",
+                                ctx->port, ctx->host);
+
+      /* Unregister old connection try */
+      silc_schedule_unset_listen_fd(client->schedule, fd);
+      silc_net_close_connection(fd);
+      silc_schedule_task_del(client->schedule, ctx->task);
+
+      /* Try again */
+      silc_client_connect_to_server_internal(ctx);
+      ctx->tries++;
+    } else {
+      /* Connection failed and we won't try anymore */
+      client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_ERROR,
+                                "Could not connect to server %s: %s",
+                                ctx->host, strerror(opt));
+      silc_schedule_unset_listen_fd(client->schedule, fd);
+      silc_net_close_connection(fd);
+      silc_schedule_task_del(client->schedule, ctx->task);
+      silc_free(ctx);
+
+      /* Notify application of failure */
+      client->internal->ops->connected(client, conn,
+                                      SILC_CLIENT_CONN_ERROR_TIMEOUT);
+    }
+    return;
+  }
+
+  silc_schedule_unset_listen_fd(client->schedule, fd);
+  silc_schedule_task_del(client->schedule, ctx->task);
+  silc_free(ctx);
+
+  silc_client_start_key_exchange(client, conn, fd);
+}
+
+/* Second part of the connecting to the server. This executed
+   authentication protocol. */
+
+SILC_TASK_CALLBACK(silc_client_connect_to_server_second)
+{
+  SilcProtocol protocol = (SilcProtocol)context;
+  SilcClientKEInternalContext *ctx =
+    (SilcClientKEInternalContext *)protocol->context;
+  SilcClient client = (SilcClient)ctx->client;
+  SilcSocketConnection sock = NULL;
+  SilcClientConnAuthInternalContext *proto_ctx;
+
+  SILC_LOG_DEBUG(("Start"));
+
+  if (protocol->state == SILC_PROTOCOL_STATE_ERROR ||
+      protocol->state == SILC_PROTOCOL_STATE_FAILURE) {
+    /* Error occured during protocol */
+    SILC_LOG_DEBUG(("Error during KE protocol"));
+    silc_protocol_free(protocol);
+    silc_ske_free_key_material(ctx->keymat);
+    if (ctx->ske)
+      silc_ske_free(ctx->ske);
+    if (ctx->dest_id)
+      silc_free(ctx->dest_id);
+    ctx->sock->protocol = NULL;
+    silc_socket_free(ctx->sock);
+
+    /* Notify application of failure */
+    silc_schedule_task_add(client->schedule, ctx->sock->sock,
+                          silc_client_connect_failure, ctx,
+                          0, 1, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+    return;
+  }
+
+  /* We now have the key material as the result of the key exchange
+     protocol. Take the key material into use. Free the raw key material
+     as soon as we've set them into use. */
+  silc_client_protocol_ke_set_keys(ctx->ske, ctx->sock, ctx->keymat,
+                                  ctx->ske->prop->cipher,
+                                  ctx->ske->prop->pkcs,
+                                  ctx->ske->prop->hash,
+                                  ctx->ske->prop->hmac,
+                                  ctx->ske->prop->group,
+                                  ctx->responder);
+  silc_ske_free_key_material(ctx->keymat);
+
+  /* Allocate internal context for the authentication protocol. This
+     is sent as context for the protocol. */
+  proto_ctx = silc_calloc(1, sizeof(*proto_ctx));
+  proto_ctx->client = (void *)client;
+  proto_ctx->sock = sock = ctx->sock;
+  proto_ctx->ske = ctx->ske;   /* Save SKE object from previous protocol */
+  proto_ctx->dest_id_type = ctx->dest_id_type;
+  proto_ctx->dest_id = ctx->dest_id;
+
+  /* Free old protocol as it is finished now */
+  silc_protocol_free(protocol);
+  if (ctx->packet)
+    silc_packet_context_free(ctx->packet);
+  ctx->packet = NULL;
+  silc_free(ctx);
+  sock->protocol = NULL;
+
+  /* Resolve the authentication method to be used in this connection. The
+     completion callback is called after the application has resolved
+     the authentication method. */
+  client->internal->ops->get_auth_method(client, sock->user_data,
+                                        sock->hostname,
+                                        sock->port,
+                                        silc_client_resolve_auth_method,
+                                        proto_ctx);
+}
+
+/* Authentication method resolving callback. Application calls this function
+   after we've called the client->internal->ops->get_auth_method
+   client operation to resolve the authentication method. We will continue
+   the executiong of the protocol in this function. */
+
+void silc_client_resolve_auth_method(bool success,
+                                    SilcProtocolAuthMeth auth_meth,
+                                    const unsigned char *auth_data,
+                                    SilcUInt32 auth_data_len, void *context)
+{
+  SilcClientConnAuthInternalContext *proto_ctx =
+    (SilcClientConnAuthInternalContext *)context;
+  SilcClient client = (SilcClient)proto_ctx->client;
+
+  if (!success)
+    auth_meth = SILC_AUTH_NONE;
+
+  proto_ctx->auth_meth = auth_meth;
+
+  if (success && auth_data && auth_data_len) {
+
+    /* Passphrase must be UTF-8 encoded, if it isn't encode it */
+    if (auth_meth == SILC_AUTH_PASSWORD &&
+       !silc_utf8_valid(auth_data, auth_data_len)) {
+      int payload_len = 0;
+      unsigned char *autf8 = NULL;
+      payload_len = silc_utf8_encoded_len(auth_data, auth_data_len,
+                                         SILC_STRING_ASCII);
+      autf8 = silc_calloc(payload_len, sizeof(*autf8));
+      auth_data_len = silc_utf8_encode(auth_data, auth_data_len,
+                                      SILC_STRING_ASCII, autf8, payload_len);
+      auth_data = autf8;
+    }
+
+    proto_ctx->auth_data = silc_memdup(auth_data, auth_data_len);
+    proto_ctx->auth_data_len = auth_data_len;
+  }
+
+  /* Allocate the authenteication protocol and execute it. */
+  silc_protocol_alloc(SILC_PROTOCOL_CLIENT_CONNECTION_AUTH,
+                     &proto_ctx->sock->protocol, (void *)proto_ctx,
+                     silc_client_connect_to_server_final);
+
+  /* Execute the protocol */
+  silc_protocol_execute(proto_ctx->sock->protocol, client->schedule, 0, 0);
+}
+
+/* Finalizes the connection to the remote SILC server. This is called
+   after authentication protocol has been completed. This send our
+   user information to the server to receive our client ID from
+   server. */
+
+SILC_TASK_CALLBACK(silc_client_connect_to_server_final)
+{
+  SilcProtocol protocol = (SilcProtocol)context;
+  SilcClientConnAuthInternalContext *ctx =
+    (SilcClientConnAuthInternalContext *)protocol->context;
+  SilcClient client = (SilcClient)ctx->client;
+  SilcClientConnection conn = (SilcClientConnection)ctx->sock->user_data;
+  SilcBuffer packet;
+
+  SILC_LOG_DEBUG(("Start"));
+
+  if (protocol->state == SILC_PROTOCOL_STATE_ERROR ||
+      protocol->state == SILC_PROTOCOL_STATE_FAILURE) {
+    /* Error occured during protocol */
+    SILC_LOG_DEBUG(("Error during authentication protocol"));
+    ctx->status = SILC_CLIENT_CONN_ERROR_AUTH;
+    goto err;
+  }
+
+  if (conn->internal->params.detach_data) {
+    /* Send RESUME_CLIENT packet to the server, which is used to resume
+       old detached session back. */
+    SilcBuffer auth;
+    SilcClientID *old_client_id;
+    unsigned char *old_id;
+    SilcUInt16 old_id_len;
+
+    if (!silc_client_process_detach_data(client, conn, &old_id, &old_id_len)) {
+      ctx->status = SILC_CLIENT_CONN_ERROR_RESUME;
+      goto err;
+    }
+
+    old_client_id = silc_id_str2id(old_id, old_id_len, SILC_ID_CLIENT);
+    if (!old_client_id) {
+      silc_free(old_id);
+      ctx->status = SILC_CLIENT_CONN_ERROR_RESUME;
+      goto err;
+    }
+
+    /* Generate authentication data that server will verify */
+    auth = silc_auth_public_key_auth_generate(client->public_key,
+                                             client->private_key,
+                                             client->rng,
+                                             conn->internal->hash,
+                                             old_client_id, SILC_ID_CLIENT);
+    if (!auth) {
+      silc_free(old_client_id);
+      silc_free(old_id);
+      ctx->status = SILC_CLIENT_CONN_ERROR_RESUME;
+      goto err;
+    }
+
+    packet = silc_buffer_alloc_size(2 + old_id_len + auth->len);
+    silc_buffer_format(packet,
+                      SILC_STR_UI_SHORT(old_id_len),
+                      SILC_STR_UI_XNSTRING(old_id, old_id_len),
+                      SILC_STR_UI_XNSTRING(auth->data, auth->len),
+                      SILC_STR_END);
+
+    /* Send the packet */
+    silc_client_packet_send(client, ctx->sock, SILC_PACKET_RESUME_CLIENT,
+                           NULL, 0, NULL, NULL,
+                           packet->data, packet->len, TRUE);
+    silc_buffer_free(packet);
+    silc_buffer_free(auth);
+    silc_free(old_client_id);
+    silc_free(old_id);
+  } else {
+    /* Send NEW_CLIENT packet to the server. We will become registered
+       to the SILC network after sending this packet and we will receive
+       client ID from the server. */
+    packet = silc_buffer_alloc(2 + 2 + strlen(client->username) +
+                              strlen(client->realname));
+    silc_buffer_pull_tail(packet, SILC_BUFFER_END(packet));
+    silc_buffer_format(packet,
+                      SILC_STR_UI_SHORT(strlen(client->username)),
+                      SILC_STR_UI_XNSTRING(client->username,
+                                           strlen(client->username)),
+                      SILC_STR_UI_SHORT(strlen(client->realname)),
+                      SILC_STR_UI_XNSTRING(client->realname,
+                                           strlen(client->realname)),
+                      SILC_STR_END);
+
+    /* Send the packet */
+    silc_client_packet_send(client, ctx->sock, SILC_PACKET_NEW_CLIENT,
+                           NULL, 0, NULL, NULL,
+                           packet->data, packet->len, TRUE);
+    silc_buffer_free(packet);
+  }
+
+  /* Save remote ID. */
+  conn->remote_id = ctx->dest_id;
+  conn->remote_id_data = silc_id_id2str(ctx->dest_id, SILC_ID_SERVER);
+  conn->remote_id_data_len = silc_id_get_len(ctx->dest_id, SILC_ID_SERVER);
+
+  /* Register re-key timeout */
+  conn->internal->rekey->timeout = client->internal->params->rekey_secs;
+  conn->internal->rekey->context = (void *)client;
+  silc_schedule_task_add(client->schedule, conn->sock->sock,
+                        silc_client_rekey_callback,
+                        (void *)conn->sock, conn->internal->rekey->timeout, 0,
+                        SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+
+  silc_protocol_free(protocol);
+  silc_free(ctx->auth_data);
+  if (ctx->ske)
+    silc_ske_free(ctx->ske);
+  silc_socket_free(ctx->sock);
+  silc_free(ctx);
+  conn->sock->protocol = NULL;
+  return;
+
+ err:
+  silc_protocol_free(protocol);
+  silc_free(ctx->auth_data);
+  silc_free(ctx->dest_id);
+  if (ctx->ske)
+    silc_ske_free(ctx->ske);
+  conn->sock->protocol = NULL;
+  silc_socket_free(ctx->sock);
+
+  /* Notify application of failure */
+  silc_schedule_task_add(client->schedule, ctx->sock->sock,
+                        silc_client_connect_failure_auth, ctx,
+                        0, 1, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+}
+
+/* Internal routine that sends packet or marks packet to be sent. This
+   is used directly only in special cases. Normal cases should use
+   silc_server_packet_send. Returns < 0 on error. */
+
+int silc_client_packet_send_real(SilcClient client,
+                                SilcSocketConnection sock,
+                                bool force_send)
+{
+  int ret;
+
+  /* If rekey protocol is active we must assure that all packets are
+     sent through packet queue. */
+  if (SILC_CLIENT_IS_REKEY(sock))
+    force_send = FALSE;
 
-  /* Process packet in thread */
-  silc_fsm_set_state_context(thread, packet);
-  silc_fsm_start_sync(thread, silc_client_connection_st_packet);
+  /* If outbound data is already pending do not force send */
+  if (SILC_IS_OUTBUF_PENDING(sock))
+    force_send = FALSE;
 
-  return TRUE;
-}
+  /* Send the packet */
+  ret = silc_packet_send(sock, force_send);
+  if (ret != -2)
+    return ret;
 
-/* Packet engine callback to indicate end of stream */
+  /* Mark that there is some outgoing data available for this connection.
+     This call sets the connection both for input and output (the input
+     is set always and this call keeps the input setting, actually).
+     Actual data sending is performed by silc_client_packet_process. */
+  SILC_CLIENT_SET_CONNECTION_FOR_OUTPUT(client->schedule, sock->sock);
 
-static void silc_client_packet_eos(SilcPacketEngine engine,
-                                  SilcPacketStream stream,
-                                  void *callback_context,
-                                  void *stream_context)
-{
-  SILC_LOG_DEBUG(("End of stream received"));
+  /* Mark to socket that data is pending in outgoing buffer. This flag
+     is needed if new data is added to the buffer before the earlier
+     put data is sent to the network. */
+  SILC_SET_OUTBUF_PENDING(sock);
+
+  return 0;
 }
 
-/* Packet engine callback to indicate error */
+/* Packet processing callback. This is used to send and receive packets
+   from network. This is generic task. */
 
-static void silc_client_packet_error(SilcPacketEngine engine,
-                                    SilcPacketStream stream,
-                                    SilcPacketError error,
-                                    void *callback_context,
-                                    void *stream_context)
+SILC_TASK_CALLBACK_GLOBAL(silc_client_packet_process)
 {
+  SilcClient client = (SilcClient)context;
+  SilcSocketConnection sock = NULL;
+  SilcClientConnection conn;
+  int ret;
 
-}
+  SILC_LOG_DEBUG(("Processing packet"));
 
-/* Packet stream callbacks */
-static SilcPacketCallbacks silc_client_stream_cbs =
-{
-  silc_client_packet_receive,
-  silc_client_packet_eos,
-  silc_client_packet_error
-};
+  SILC_CLIENT_GET_SOCK(client, fd, sock);
+  if (sock == NULL)
+    return;
 
-/* FSM destructor */
+  conn = (SilcClientConnection)sock->user_data;
 
-void silc_client_fsm_destructor(SilcFSM fsm, void *fsm_context,
-                               void *destructor_context)
-{
-  silc_fsm_free(fsm);
-}
+  /* Packet sending */
+  if (type == SILC_TASK_WRITE) {
+    /* Do not send data to disconnected connection */
+    if (SILC_IS_DISCONNECTED(sock))
+      return;
 
+    ret = silc_packet_send(sock, TRUE);
 
-/************************** Connection's machine ****************************/
+    /* If returned -2 could not write to connection now, will do
+       it later. */
+    if (ret == -2)
+      return;
 
-/* Start the connection's state machine.  If threads are in use the machine
-   is always executed in a real thread. */
+    /* Error */
+    if (ret == -1)
+      return;
 
-SILC_FSM_STATE(silc_client_connection_st_start)
-{
-  SilcClientConnection conn = fsm_context;
-  SilcFSM connfsm;
-
-  /* Take scheduler for connection */
-  conn->internal->schedule = silc_fsm_get_schedule(fsm);
-
-  /*** Run connection machine */
-  connfsm = &conn->internal->fsm;
-  silc_fsm_init(connfsm, conn, silc_client_connection_destructor,
-               fsm, conn->internal->schedule);
-  silc_fsm_sema_init(&conn->internal->wait_event, connfsm, 0);
-  silc_fsm_start_sync(connfsm, silc_client_connection_st_run);
-
-  /* Schedule any events set in initialization */
-  if (conn->internal->connect)
-    SILC_FSM_SEMA_POST(&conn->internal->wait_event);
-  if (conn->internal->key_exchange)
-    SILC_FSM_SEMA_POST(&conn->internal->wait_event);
-
-  /* Wait until this thread is terminated from the machine destructor */
-  return SILC_FSM_WAIT;
-}
+    /* The packet has been sent and now it is time to set the connection
+       back to only for input. When there is again some outgoing data
+       available for this connection it will be set for output as well.
+       This call clears the output setting and sets it only for input. */
+    SILC_CLIENT_SET_CONNECTION_FOR_INPUT(client->schedule, fd);
+    SILC_UNSET_OUTBUF_PENDING(sock);
 
-/* Connection machine main state.  This handles various connection related
-   events, but not packet processing.  It's done in dedicated packet
-   processing FSM thread. */
+    silc_buffer_clear(sock->outbuf);
+    return;
+  }
 
-SILC_FSM_STATE(silc_client_connection_st_run)
-{
-  SilcClientConnection conn = fsm_context;
-  SilcFSMThread thread;
+  /* Packet receiving */
+  if (type == SILC_TASK_READ) {
+    /* Read data from network */
+    ret = silc_packet_receive(sock);
+    if (ret < 0)
+      return;
+
+    /* EOF */
+    if (ret == 0) {
+      SILC_LOG_DEBUG(("Read EOF"));
+
+      /* If connection is disconnecting already we will finally
+        close the connection */
+      if (SILC_IS_DISCONNECTING(sock)) {
+       if (sock == conn->sock && sock->type != SILC_SOCKET_TYPE_CLIENT)
+         client->internal->ops->disconnected(client, conn, 0, NULL);
+       silc_client_close_connection_real(client, sock, conn);
+       return;
+      }
+
+      SILC_LOG_DEBUG(("EOF from connection %d", sock->sock));
+      if (sock == conn->sock && sock->type != SILC_SOCKET_TYPE_CLIENT)
+       client->internal->ops->disconnected(client, conn, 0, NULL);
+      silc_client_close_connection_real(client, sock, conn);
+      return;
+    }
 
-  /* Wait for events */
-  SILC_FSM_SEMA_WAIT(&conn->internal->wait_event);
+    /* Process the packet. This will call the parser that will then
+       decrypt and parse the packet. */
+    if (sock->type != SILC_SOCKET_TYPE_UNKNOWN)
+      silc_packet_receive_process(sock, FALSE, conn->internal->receive_key,
+                                 conn->internal->hmac_receive,
+                                 conn->internal->psn_receive,
+                                 silc_client_packet_parse, client);
+    else
+      silc_packet_receive_process(sock, FALSE, NULL, NULL, 0,
+                                 silc_client_packet_parse, client);
+  }
+}
 
-  /* Process events */
-  thread = &conn->internal->event_thread;
+/* Parser callback called by silc_packet_receive_process. Thie merely
+   registers timeout that will handle the actual parsing when appropriate. */
 
-  if (conn->internal->connect) {
-    SILC_LOG_DEBUG(("Event: connect"));
-    conn->internal->connect = FALSE;
+static bool silc_client_packet_parse(SilcPacketParserContext *parser_context,
+                                    void *context)
+{
+  SilcClient client = (SilcClient)context;
+  SilcSocketConnection sock = parser_context->sock;
+  SilcClientConnection conn = (SilcClientConnection)sock->user_data;
+  SilcPacketContext *packet = parser_context->packet;
+  SilcPacketType ret;
 
-    /*** Event: connect */
-    silc_fsm_thread_init(thread, &conn->internal->fsm, conn,
-                        NULL, NULL, FALSE);
-    silc_fsm_start_sync(thread, silc_client_st_connect);
-    return SILC_FSM_CONTINUE;
-  }
+  if (conn && conn->internal->hmac_receive && conn->sock == sock)
+    conn->internal->psn_receive = parser_context->packet->sequence + 1;
 
-  if (conn->internal->key_exchange) {
-    SILC_LOG_DEBUG(("Event: key exchange"));
-    conn->internal->key_exchange = FALSE;
+  /* Parse the packet immediately */
+  if (parser_context->normal)
+    ret = silc_packet_parse(packet, conn->internal->receive_key);
+  else
+    ret = silc_packet_parse_special(packet, conn->internal->receive_key);
 
-    /*** Event: key exchange */
-    silc_fsm_thread_init(thread, &conn->internal->fsm, conn,
-                        NULL, NULL, FALSE);
-    silc_fsm_start_sync(thread, silc_client_st_connect_set_stream);
-    return SILC_FSM_CONTINUE;
+  if (ret == SILC_PACKET_NONE) {
+    silc_packet_context_free(packet);
+    silc_free(parser_context);
+    return FALSE;
   }
 
-  if (conn->internal->disconnected) {
-    /** Event: disconnected */
-    SILC_LOG_DEBUG(("Event: disconnected"));
-    conn->internal->disconnected = FALSE;
-    silc_fsm_next(fsm, silc_client_connection_st_close);
-    return SILC_FSM_CONTINUE;
+  /* If protocol for this connection is key exchange or rekey then we'll
+     process all packets synchronously, since there might be packets in
+     queue that we are not able to decrypt without first processing the
+     packets before them. */
+  if (sock->protocol && sock->protocol->protocol &&
+      (sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_KEY_EXCHANGE ||
+       sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_REKEY)) {
+
+    /* Parse the incoming packet type */
+    silc_client_packet_parse_type(client, sock, packet);
+
+    /* Reprocess the buffer since we'll return FALSE. This is because
+       the `conn->internal->receive_key' might have become valid by processing
+       the previous packet */
+    if (sock->type != SILC_SOCKET_TYPE_UNKNOWN)
+      silc_packet_receive_process(sock, FALSE, conn->internal->receive_key,
+                                 conn->internal->hmac_receive,
+                                 conn->internal->psn_receive,
+                                 silc_client_packet_parse, client);
+    else
+      silc_packet_receive_process(sock, FALSE, NULL, NULL, 0,
+                                 silc_client_packet_parse, client);
+
+    silc_packet_context_free(packet);
+    silc_free(parser_context);
+
+    return FALSE;
   }
 
-  /* NOT REACHED */
-  SILC_ASSERT(FALSE);
-  return SILC_FSM_CONTINUE;
+  /* Parse the incoming packet type */
+  silc_client_packet_parse_type(client, sock, packet);
+  silc_packet_context_free(packet);
+  silc_free(parser_context);
+  return TRUE;
 }
 
-/* Packet processor thread.  Each incoming packet is processed in FSM
-   thread in this state.  The thread is run in the connection machine. */
+/* Parses the packet type and calls what ever routines the packet type
+   requires. This is done for all incoming packets. */
 
-SILC_FSM_STATE(silc_client_connection_st_packet)
+void silc_client_packet_parse_type(SilcClient client,
+                                  SilcSocketConnection sock,
+                                  SilcPacketContext *packet)
 {
-  SilcPacket packet = state_context;
+  SilcBuffer buffer = packet->buffer;
+  SilcPacketType type = packet->type;
 
-  SILC_LOG_DEBUG(("Parsing %s packet", silc_get_packet_name(packet->type)));
+  SILC_LOG_DEBUG(("Parsing %s packet", silc_get_packet_name(type)));
 
-  switch (packet->type) {
+  /* Parse the packet type */
+  switch(type) {
 
-  case SILC_PACKET_PRIVATE_MESSAGE:
-    /** Private message */
-    silc_fsm_next(fsm, silc_client_private_message);
+  case SILC_PACKET_DISCONNECT:
+    silc_client_disconnected_by_server(client, sock, buffer);
     break;
 
-  case SILC_PACKET_CHANNEL_MESSAGE:
-    /** Channel message */
-    silc_fsm_next(fsm, silc_client_channel_message);
+  case SILC_PACKET_SUCCESS:
+    /*
+     * Success received for something. For now we can have only
+     * one protocol for connection executing at once hence this
+     * success message is for whatever protocol is executing currently.
+     */
+    if (sock->protocol)
+      silc_protocol_execute(sock->protocol, client->schedule, 0, 0);
     break;
 
-  case SILC_PACKET_FTP:
-    /* File transfer packet */
-    //    silc_client_ftp(client, conn, packet);
+  case SILC_PACKET_FAILURE:
+    /*
+     * Failure received for some protocol. Set the protocol state to
+     * error and call the protocol callback. This fill cause error on
+     * protocol and it will call the final callback.
+     */
+    silc_client_process_failure(client, sock, packet);
     break;
 
-  case SILC_PACKET_CHANNEL_KEY:
-    /** Channel key */
-    silc_fsm_next(fsm, silc_client_channel_key);
+  case SILC_PACKET_REJECT:
     break;
 
-  case SILC_PACKET_COMMAND_REPLY:
-    /** Command reply */
-    silc_fsm_next(fsm, silc_client_command_reply);
+  case SILC_PACKET_NOTIFY:
+    /*
+     * Received notify message
+     */
+    silc_client_notify_by_server(client, sock, packet);
     break;
 
-  case SILC_PACKET_NOTIFY:
-    /** Notify */
-    silc_fsm_next(fsm, silc_client_notify);
+  case SILC_PACKET_ERROR:
+    /*
+     * Received error message
+     */
+    silc_client_error_by_server(client, sock, buffer);
     break;
 
-  case SILC_PACKET_PRIVATE_MESSAGE_KEY:
-    /* Private message key indicator */
-    silc_fsm_next(fsm, silc_client_private_message_key);
+  case SILC_PACKET_CHANNEL_MESSAGE:
+    /*
+     * Received message to (from, actually) a channel
+     */
+    silc_client_channel_message(client, sock, packet);
     break;
 
-  case SILC_PACKET_DISCONNECT:
-    /** Disconnect */
-    silc_fsm_next(fsm, silc_client_disconnect);
+  case SILC_PACKET_CHANNEL_KEY:
+    /*
+     * Received key for a channel. By receiving this key the client will be
+     * able to talk to the channel it has just joined. This can also be
+     * a new key for existing channel as keys expire peridiocally.
+     */
+    silc_client_receive_channel_key(client, sock, buffer);
     break;
 
-  case SILC_PACKET_ERROR:
-    /* Error by server */
-    silc_fsm_next(fsm, silc_client_error);
+  case SILC_PACKET_PRIVATE_MESSAGE:
+    /*
+     * Received private message
+     */
+    silc_client_private_message(client, sock, packet);
     break;
 
-  case SILC_PACKET_KEY_AGREEMENT:
-    /** Key agreement */
-    silc_fsm_next(fsm, silc_client_key_agreement);
+  case SILC_PACKET_PRIVATE_MESSAGE_KEY:
+    /*
+     * Received private message key indicator
+     */
+    silc_client_private_message_key(client, sock, packet);
     break;
 
   case SILC_PACKET_COMMAND:
-    /** Command packet */
-    silc_fsm_next(fsm, silc_client_command);
+    /*
+     * Received command packet, a special case since normally client
+     * does not receive commands.
+     */
+    silc_client_command_process(client, sock, packet);
     break;
 
-  case SILC_PACKET_NEW_ID:
-    /** New ID */
-    silc_fsm_next(fsm, silc_client_new_id);
+  case SILC_PACKET_COMMAND_REPLY:
+    /*
+     * Recived reply for a command
+     */
+    silc_client_command_reply_process(client, sock, packet);
     break;
 
-  case SILC_PACKET_CONNECTION_AUTH_REQUEST:
-    /* Reply to connection authentication request to resolve authentication
-       method from server. */
-    //    silc_client_connection_auth_request(client, conn, packet);
+  case SILC_PACKET_KEY_EXCHANGE:
+    if (sock->protocol && sock->protocol->protocol &&
+       sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_KEY_EXCHANGE) {
+      SilcClientKEInternalContext *proto_ctx =
+       (SilcClientKEInternalContext *)sock->protocol->context;
+
+      proto_ctx->packet = silc_packet_context_dup(packet);
+      proto_ctx->dest_id_type = packet->src_id_type;
+      proto_ctx->dest_id = silc_id_str2id(packet->src_id, packet->src_id_len,
+                                         packet->src_id_type);
+      if (!proto_ctx->dest_id)
+       break;
+
+      /* Let the protocol handle the packet */
+      silc_protocol_execute(sock->protocol, client->schedule, 0, 0);
+    } else {
+      SILC_LOG_ERROR(("Received Key Exchange packet but no key exchange "
+                     "protocol active, packet dropped."));
+    }
     break;
 
-  default:
-    silc_packet_free(packet);
-    return SILC_FSM_FINISH;
+  case SILC_PACKET_KEY_EXCHANGE_1:
+    if (sock->protocol && sock->protocol->protocol &&
+       (sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_KEY_EXCHANGE ||
+        sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_REKEY)) {
+
+      if (sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_REKEY) {
+       SilcClientRekeyInternalContext *proto_ctx =
+         (SilcClientRekeyInternalContext *)sock->protocol->context;
+
+       if (proto_ctx->packet)
+         silc_packet_context_free(proto_ctx->packet);
+
+       proto_ctx->packet = silc_packet_context_dup(packet);
+
+       /* Let the protocol handle the packet */
+       silc_protocol_execute(sock->protocol, client->schedule, 0, 0);
+      } else {
+       SilcClientKEInternalContext *proto_ctx =
+         (SilcClientKEInternalContext *)sock->protocol->context;
+
+       if (proto_ctx->packet)
+         silc_packet_context_free(proto_ctx->packet);
+
+       proto_ctx->packet = silc_packet_context_dup(packet);
+       proto_ctx->dest_id_type = packet->src_id_type;
+       proto_ctx->dest_id = silc_id_str2id(packet->src_id, packet->src_id_len,
+                                           packet->src_id_type);
+       if (!proto_ctx->dest_id)
+         break;
+
+       /* Let the protocol handle the packet */
+       silc_protocol_execute(sock->protocol, client->schedule, 0, 0);
+      }
+    } else {
+      SILC_LOG_ERROR(("Received Key Exchange 1 packet but no key exchange "
+                     "protocol active, packet dropped."));
+    }
     break;
-  }
-
-  return SILC_FSM_CONTINUE;
-}
-
-/* Disconnection even to close remote connection.  We close the connection
-   and finish the connection machine in this state.  The connection context
-   is deleted in the machine destructor.  The connection callback must be
-   already called back to application before getting here. */
-
-SILC_FSM_STATE(silc_client_connection_st_close)
-{
-  SilcClientConnection conn = fsm_context;
 
-  SILC_LOG_DEBUG(("Closing remote connection"));
-
-  /* Abort ongoing events */
-  if (conn->internal->op)
-    silc_async_abort(conn->internal->op, NULL, NULL);
-
-  /* Close connection */
-  silc_packet_stream_destroy(conn->stream);
-
-  SILC_LOG_DEBUG(("Finishing connection machine"));
-
-  return SILC_FSM_FINISH;
-}
-
-/* Received error packet from server.  Send it to application. */
+  case SILC_PACKET_KEY_EXCHANGE_2:
+    if (sock->protocol && sock->protocol->protocol &&
+       (sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_KEY_EXCHANGE ||
+        sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_REKEY)) {
+
+      if (sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_REKEY) {
+       SilcClientRekeyInternalContext *proto_ctx =
+         (SilcClientRekeyInternalContext *)sock->protocol->context;
+
+       if (proto_ctx->packet)
+         silc_packet_context_free(proto_ctx->packet);
+
+       proto_ctx->packet = silc_packet_context_dup(packet);
+
+       /* Let the protocol handle the packet */
+       silc_protocol_execute(sock->protocol, client->schedule, 0, 0);
+      } else {
+       SilcClientKEInternalContext *proto_ctx =
+         (SilcClientKEInternalContext *)sock->protocol->context;
+
+       if (proto_ctx->packet)
+         silc_packet_context_free(proto_ctx->packet);
+        if (proto_ctx->dest_id)
+          silc_free(proto_ctx->dest_id);
+       proto_ctx->packet = silc_packet_context_dup(packet);
+       proto_ctx->dest_id_type = packet->src_id_type;
+       proto_ctx->dest_id = silc_id_str2id(packet->src_id, packet->src_id_len,
+                                           packet->src_id_type);
+       if (!proto_ctx->dest_id)
+         break;
+
+       /* Let the protocol handle the packet */
+       silc_protocol_execute(sock->protocol, client->schedule, 0, 0);
+      }
+    } else {
+      SILC_LOG_ERROR(("Received Key Exchange 2 packet but no key exchange "
+                     "protocol active, packet dropped."));
+    }
+    break;
 
-SILC_FSM_STATE(silc_client_error)
-{
-  SilcClientConnection conn = fsm_context;
-  SilcClient client = conn->client;
-  SilcPacket packet = state_context;
-  char *msg;
+  case SILC_PACKET_NEW_ID:
+    {
+      /*
+       * Received new ID from server. This packet is received at
+       * the connection to the server.  New ID is also received when
+       * user changes nickname but in that case the new ID is received
+       * as command reply and not as this packet type.
+       */
+      SilcIDPayload idp;
+
+      idp = silc_id_payload_parse(buffer->data, buffer->len);
+      if (!idp)
+       break;
+      if (silc_id_payload_get_type(idp) != SILC_ID_CLIENT)
+       break;
+
+      silc_client_receive_new_id(client, sock, idp);
+      silc_id_payload_free(idp);
+      break;
+    }
 
-  msg = silc_memdup(silc_buffer_data(&packet->buffer),
-                   silc_buffer_len(&packet->buffer));
-  if (msg)
-    client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT, msg);
+  case SILC_PACKET_HEARTBEAT:
+    /*
+     * Received heartbeat packet
+     */
+    SILC_LOG_DEBUG(("Heartbeat packet"));
+    break;
 
-  silc_free(msg);
-  silc_packet_free(packet);
+  case SILC_PACKET_KEY_AGREEMENT:
+    /*
+     * Received key agreement packet
+     */
+    SILC_LOG_DEBUG(("Key agreement packet"));
+    silc_client_key_agreement(client, sock, packet);
+    break;
 
-  return SILC_FSM_FINISH;
-}
+  case SILC_PACKET_REKEY:
+    SILC_LOG_DEBUG(("Re-key packet"));
+    /* We ignore this for now */
+    break;
 
-/* Received disconnect packet from server.  We close the connection and
-   send the disconnect message to application. */
+  case SILC_PACKET_REKEY_DONE:
+    SILC_LOG_DEBUG(("Re-key done packet"));
 
-SILC_FSM_STATE(silc_client_disconnect)
-{
-  SilcClientConnection conn = fsm_context;
-  SilcClient client = conn->client;
-  SilcPacket packet = state_context;
-  SilcStatus status;
-  char *message = NULL;
+    if (sock->protocol && sock->protocol->protocol &&
+       sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_REKEY) {
 
-  SILC_LOG_DEBUG(("Server disconnected"));
+      SilcClientRekeyInternalContext *proto_ctx =
+       (SilcClientRekeyInternalContext *)sock->protocol->context;
 
-  if (silc_buffer_len(&packet->buffer) < 1) {
-    silc_packet_free(packet);
-    return SILC_FSM_FINISH;
-  }
+      if (proto_ctx->packet)
+       silc_packet_context_free(proto_ctx->packet);
 
-  status = (SilcStatus)packet->buffer.data[0];
+      proto_ctx->packet = silc_packet_context_dup(packet);
 
-  silc_buffer_pull(&packet->buffer, 1);
-  if (silc_buffer_len(&packet->buffer) > 1 &&
-      silc_utf8_valid(silc_buffer_data(&packet->buffer),
-                     silc_buffer_len(&packet->buffer)))
-    message = silc_memdup(silc_buffer_data(&packet->buffer),
-                         silc_buffer_len(&packet->buffer));
+      /* Let the protocol handle the packet */
+      if (proto_ctx->responder == FALSE)
+       silc_protocol_execute(sock->protocol, client->schedule, 0, 0);
+      else
+       /* Let the protocol handle the packet */
+       silc_protocol_execute(sock->protocol, client->schedule,
+                             0, 100000);
+    } else {
+      SILC_LOG_ERROR(("Received Re-key done packet but no re-key "
+                     "protocol active, packet dropped."));
+    }
+    break;
 
-  /* Call connection callback */
-  conn->callback(client, conn, SILC_CLIENT_CONN_DISCONNECTED, status,
-                message, conn->callback_context);
+  case SILC_PACKET_CONNECTION_AUTH_REQUEST:
+    /*
+     * Reveived reply to our connection authentication method request
+     * packet. This is used to resolve the authentication method for the
+     * current session from the server if the client does not know it.
+     */
+    silc_client_connection_auth_request(client, sock, packet);
+    break;
 
-  silc_free(message);
-  silc_packet_free(packet);
+  case SILC_PACKET_FTP:
+    /* Received file transfer packet. */
+    silc_client_ftp(client, sock, packet);
+    break;
 
-  /* Signal to close connection */
-  if (!conn->internal->disconnected) {
-    conn->internal->disconnected = TRUE;
-    SILC_FSM_SEMA_POST(&conn->internal->wait_event);
+  default:
+    SILC_LOG_DEBUG(("Incorrect packet type %d, packet dropped", type));
+    break;
   }
-
-  return SILC_FSM_FINISH;
 }
 
-/*************************** Main client machine ****************************/
-
-/* The client's main state where we wait for various events */
-
-SILC_FSM_STATE(silc_client_st_run)
+/* Sends packet. This doesn't actually send the packet instead it assembles
+   it and marks it to be sent. However, if force_send is TRUE the packet
+   is sent immediately. if dst_id, cipher and hmac are NULL those parameters
+   will be derived from sock argument. Otherwise the valid arguments sent
+   are used. */
+
+void silc_client_packet_send(SilcClient client,
+                            SilcSocketConnection sock,
+                            SilcPacketType type,
+                            void *dst_id,
+                            SilcIdType dst_id_type,
+                            SilcCipher cipher,
+                            SilcHmac hmac,
+                            unsigned char *data,
+                            SilcUInt32 data_len,
+                            bool force_send)
 {
-  SilcClient client = fsm_context;
+  SilcPacketContext packetdata;
+  const SilcBufferStruct packet;
+  int block_len;
+  SilcUInt32 sequence = 0;
+  int src_id_allocated = FALSE;
 
-  /* Wait for events */
-  SILC_FSM_SEMA_WAIT(&client->internal->wait_event);
-
-  /* Process events */
-
-  if (client->internal->run_callback && client->internal->ops->running) {
-    /* Call running callbcak back to application */
-    SILC_LOG_DEBUG(("We are running, call running callback"));
-    client->internal->run_callback = FALSE;
-    client->internal->ops->running(client, client->application);
-    return SILC_FSM_CONTINUE;
-  }
-
-  /* NOT REACHED */
-  SILC_ASSERT(FALSE);
-  return SILC_FSM_CONTINUE;
-}
-
-/******************************* Private API ********************************/
-
-/* Adds new connection.  Creates the connection context and returns it. */
+  if (!sock)
+    return;
 
-static SilcClientConnection
-silc_client_add_connection(SilcClient client,
-                          SilcConnectionType conn_type,
-                          SilcClientConnectionParams *params,
-                          SilcPublicKey public_key,
-                          SilcPrivateKey private_key,
-                          char *remote_host, int port,
-                          SilcClientConnectCallback callback,
-                          void *context)
-{
-  SilcClientConnection conn;
-  SilcFSMThread thread;
+  SILC_LOG_DEBUG(("Sending packet, type %d", type));
 
-  if (!callback)
-    return NULL;
+  /* Get data used in the packet sending, keys and stuff */
+  if ((!cipher || !hmac || !dst_id) && sock->user_data) {
+    if (!cipher && ((SilcClientConnection)sock->user_data)->internal->send_key)
+      cipher = ((SilcClientConnection)sock->user_data)->internal->send_key;
 
-  SILC_LOG_DEBUG(("Adding new connection to %s:%d", remote_host, port));
+    if (!hmac && ((SilcClientConnection)sock->user_data)->internal->hmac_send)
+      hmac = ((SilcClientConnection)sock->user_data)->internal->hmac_send;
 
-  conn = silc_calloc(1, sizeof(*conn));
-  if (!conn)
-    return NULL;
+    if (!dst_id && ((SilcClientConnection)sock->user_data)->remote_id) {
+      dst_id = ((SilcClientConnection)sock->user_data)->remote_id;
+      dst_id_type = SILC_ID_SERVER;
+    }
 
-  conn->client = client;
-  conn->public_key = public_key;
-  conn->private_key = private_key;
-  conn->remote_host = strdup(remote_host);
-  conn->remote_port = port ? port : 706;
-  conn->type = conn_type;
-  conn->callback = callback;
-  conn->callback_context = context;
+    if (hmac)
+      sequence = ((SilcClientConnection)sock->user_data)->internal->psn_send++;
 
-  conn->internal = silc_calloc(1, sizeof(*conn->internal));
-  if (!conn->internal) {
-    silc_free(conn);
-    return NULL;
+    /* Check for mandatory rekey */
+    if (sequence == SILC_CLIENT_REKEY_THRESHOLD)
+      silc_schedule_task_add(client->schedule, sock->sock,
+                            silc_client_rekey_callback, sock, 0, 1,
+                            SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
   }
-  conn->internal->retry_timer = SILC_CLIENT_RETRY_MIN;
-  silc_mutex_alloc(&conn->internal->lock);
-  silc_atomic_init16(&conn->internal->cmd_ident, 0);
-
-  if (!silc_hash_alloc("sha1", &conn->internal->sha1hash)) {
-    silc_free(conn);
-    silc_free(conn->internal);
-    return NULL;
+
+  block_len = cipher ? silc_cipher_get_block_len(cipher) : 0;
+
+  /* Set the packet context pointers */
+  packetdata.flags = 0;
+  packetdata.type = type;
+  if (sock->user_data &&
+      ((SilcClientConnection)sock->user_data)->local_id_data) {
+    packetdata.src_id = ((SilcClientConnection)sock->user_data)->local_id_data;
+    packetdata.src_id_len =
+      silc_id_get_len(((SilcClientConnection)sock->user_data)->local_id,
+                     SILC_ID_CLIENT);
+  } else {
+    packetdata.src_id = silc_calloc(SILC_ID_CLIENT_LEN, sizeof(unsigned char));
+    packetdata.src_id_len = SILC_ID_CLIENT_LEN;
+    src_id_allocated = TRUE;
   }
-  if (params)
-    conn->internal->params = *params;
-  conn->internal->verbose = TRUE;
-  silc_list_init(conn->internal->pending_commands,
-                struct SilcClientCommandContextStruct, next);
-  silc_list_init(conn->internal->thread_pool, SilcFSMThreadStruct, next);
-
-  conn->internal->client_cache = silc_idcache_alloc(0, SILC_ID_CLIENT,
-                                                   NULL, NULL);
-  conn->internal->channel_cache = silc_idcache_alloc(0, SILC_ID_CHANNEL,
-                                                    NULL, NULL);
-  conn->internal->server_cache = silc_idcache_alloc(0, SILC_ID_SERVER,
-                                                   NULL, NULL);
-  if (!conn->internal->client_cache || !conn->internal->channel_cache ||
-      !conn->internal->server_cache) {
-    silc_client_del_connection(client, conn);
-    return NULL;
+  packetdata.src_id_type = SILC_ID_CLIENT;
+  if (dst_id) {
+    packetdata.dst_id = silc_id_id2str(dst_id, dst_id_type);
+    packetdata.dst_id_len = silc_id_get_len(dst_id, dst_id_type);
+    packetdata.dst_id_type = dst_id_type;
+  } else {
+    packetdata.dst_id = NULL;
+    packetdata.dst_id_len = 0;
+    packetdata.dst_id_type = SILC_ID_NONE;
   }
-
-  conn->internal->ftp_sessions = silc_dlist_init();
-
-  /* Run the connection state machine.  If threads are in use the machine
-     is always run in a real thread. */
-  thread = silc_fsm_thread_alloc(&client->internal->fsm, conn,
-                                silc_client_fsm_destructor, NULL,
-                                client->internal->params->threads);
-  if (!thread) {
-    silc_client_del_connection(client, conn);
-    return NULL;
+  data_len = SILC_PACKET_DATALEN(data_len, (SILC_PACKET_HEADER_LEN +
+                                           packetdata.src_id_len +
+                                           packetdata.dst_id_len));
+  packetdata.truelen = data_len + SILC_PACKET_HEADER_LEN +
+    packetdata.src_id_len + packetdata.dst_id_len;
+  if (type == SILC_PACKET_CONNECTION_AUTH)
+    SILC_PACKET_PADLEN_MAX(packetdata.truelen, block_len, packetdata.padlen);
+  else
+    SILC_PACKET_PADLEN(packetdata.truelen, block_len, packetdata.padlen);
+
+  /* Create the outgoing packet */
+  if (!silc_packet_assemble(&packetdata, client->rng, cipher, hmac, sock,
+                            data, data_len, (const SilcBuffer)&packet)) {
+    SILC_LOG_ERROR(("Error assembling packet"));
+    goto out;
   }
-  silc_fsm_start(thread, silc_client_connection_st_start);
 
-  return conn;
-}
+  /* Encrypt the packet */
+  if (cipher)
+    silc_packet_encrypt(cipher, hmac, sequence, (SilcBuffer)&packet,
+                        packet.len);
 
-/* Deletes connection.  This is always called from the connection machine
-   destructor.  Do not call this directly other places. */
+  SILC_LOG_HEXDUMP(("Packet (%d), len %d", sequence, packet.len),
+                  packet.data, packet.len);
 
-void silc_client_del_connection(SilcClient client, SilcClientConnection conn)
-{
-  SilcList list;
-  SilcIDCacheEntry entry;
-  SilcFSMThread thread;
-  SilcClientCommandContext cmd;
-
-  SILC_LOG_DEBUG(("Freeing connection %p", conn));
-
-  /* Free all cache entries */
-  if (silc_idcache_get_all(conn->internal->client_cache, &list)) {
-    silc_list_start(list);
-    while ((entry = silc_list_get(list)))
-      silc_client_del_client(client, conn, entry->context);
-  }
-  if (silc_idcache_get_all(conn->internal->channel_cache, &list)) {
-    silc_list_start(list);
-    while ((entry = silc_list_get(list)))
-      silc_client_del_channel(client, conn, entry->context);
-  }
-  if (silc_idcache_get_all(conn->internal->server_cache, &list)) {
-    silc_list_start(list);
-    while ((entry = silc_list_get(list)))
-      silc_client_del_server(client, conn, entry->context);
-  }
+  /* Now actually send the packet */
+  silc_client_packet_send_real(client, sock, force_send);
 
-  /* Free ID caches */
-  if (conn->internal->client_cache)
-    silc_idcache_free(conn->internal->client_cache);
-  if (conn->internal->channel_cache)
-    silc_idcache_free(conn->internal->channel_cache);
-  if (conn->internal->server_cache)
-    silc_idcache_free(conn->internal->server_cache);
-
-  /* Free thread pool */
-  silc_list_start(conn->internal->thread_pool);
-  while ((thread = silc_list_get(conn->internal->thread_pool)))
-    silc_fsm_free(thread);
-
-  /* Free pending commands */
-  silc_list_start(conn->internal->pending_commands);
-  while ((cmd = silc_list_get(conn->internal->pending_commands)))
-    silc_client_command_free(cmd);
-
-  silc_free(conn->remote_host);
-  silc_buffer_free(conn->internal->local_idp);
-  silc_buffer_free(conn->internal->remote_idp);
-  silc_mutex_free(conn->internal->lock);
-  if (conn->internal->hash)
-    silc_hash_free(conn->internal->hash);
-  if (conn->internal->sha1hash)
-    silc_hash_free(conn->internal->sha1hash);
-  silc_atomic_uninit16(&conn->internal->cmd_ident);
-
-  silc_free(conn->internal);
-  memset(conn, 'F', sizeof(*conn));
-  silc_free(conn);
+ out:
+  if (src_id_allocated && packetdata.src_id)
+    silc_free(packetdata.src_id);
+  if (packetdata.dst_id)
+    silc_free(packetdata.dst_id);
 }
 
+/* Packet sending routine for application.  This is the only routine that
+   is provided for application to send SILC packets. */
 
-/******************************* Client API *********************************/
-
-/* Connects to remote server.  This is the main routine used to connect
-   to remote SILC server.  Performs key exchange also.  Returns the
-   connection context to the connection callback. */
-
-SilcBool silc_client_connect_to_server(SilcClient client,
-                                      SilcClientConnectionParams *params,
-                                      SilcPublicKey public_key,
-                                      SilcPrivateKey private_key,
-                                      char *remote_host, int port,
-                                      SilcClientConnectCallback callback,
-                                      void *context)
+bool silc_client_send_packet(SilcClient client,
+                            SilcClientConnection conn,
+                            SilcPacketType type,
+                            const unsigned char *data,
+                            SilcUInt32 data_len)
 {
-  SilcClientConnection conn;
-
-  if (!client || !remote_host)
-    return FALSE;
 
-  /* Add new connection */
-  conn = silc_client_add_connection(client, SILC_CONN_SERVER, params,
-                                   public_key, private_key, remote_host,
-                                   port, callback, context);
-  if (!conn) {
-    callback(client, NULL, SILC_CLIENT_CONN_ERROR, 0, NULL, context);
+  assert(client);
+  if (!conn)
     return FALSE;
-  }
-
-  client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT,
-                            "Connecting to port %d of server %s",
-                            port, remote_host);
 
-  /* Signal connection machine to start connecting */
-  conn->internal->connect = TRUE;
+  silc_client_packet_send(client, conn->sock, type, NULL, 0, NULL, NULL,
+                         (unsigned char *)data, data_len, TRUE);
   return TRUE;
 }
 
-/* Connects to remote client.  Performs key exchange also.  Returns the
-   connection context to the connection callback. */
-
-SilcBool silc_client_connect_to_client(SilcClient client,
-                                      SilcClientConnectionParams *params,
-                                      SilcPublicKey public_key,
-                                      SilcPrivateKey private_key,
-                                      char *remote_host, int port,
-                                      SilcClientConnectCallback callback,
-                                      void *context)
+void silc_client_packet_queue_purge(SilcClient client,
+                                   SilcSocketConnection sock)
 {
-  SilcClientConnection conn;
-
-  if (!client || !remote_host)
-    return FALSE;
+  if (sock && SILC_IS_OUTBUF_PENDING(sock) &&
+      !(SILC_IS_DISCONNECTED(sock))) {
+    int ret;
+
+    ret = silc_packet_send(sock, TRUE);
+    if (ret == -2) {
+      if (sock->outbuf && sock->outbuf->len > 0) {
+       /* Couldn't send all data, put the queue back up, we'll send
+          rest later. */
+       SILC_CLIENT_SET_CONNECTION_FOR_OUTPUT(client->schedule, sock->sock);
+       SILC_SET_OUTBUF_PENDING(sock);
+       return;
+      }
+    }
 
-  /* Add new connection */
-  conn = silc_client_add_connection(client, SILC_CONN_CLIENT, params,
-                                   public_key, private_key, remote_host,
-                                   port, callback, context);
-  if (!conn) {
-    callback(client, NULL, SILC_CLIENT_CONN_ERROR, 0, NULL, context);
-    return FALSE;
+    /* Purged all data */
+    SILC_UNSET_OUTBUF_PENDING(sock);
+    SILC_CLIENT_SET_CONNECTION_FOR_INPUT(client->schedule, sock->sock);
+    silc_buffer_clear(sock->outbuf);
   }
-
-  /* Signal connection machine to start connecting */
-  conn->internal->connect = TRUE;
-  return TRUE;
 }
 
-/* Starts key exchange in the remote stream indicated by `stream'.  This
-   creates the connection context and returns it in the connection callback. */
-
-SilcBool silc_client_key_exchange(SilcClient client,
-                                 SilcClientConnectionParams *params,
-                                 SilcPublicKey public_key,
-                                 SilcPrivateKey private_key,
-                                 SilcStream stream,
-                                 SilcConnectionType conn_type,
-                                 SilcClientConnectCallback callback,
-                                 void *context)
+/* Closes connection to remote end. Free's all allocated data except
+   for some information such as nickname etc. that are valid at all time.
+   If the `sock' is NULL then the conn->sock will be used.  If `sock' is
+   provided it will be checked whether the sock and `conn->sock' are the
+   same (they can be different, ie. a socket can use `conn' as its
+   connection but `conn->sock' might be actually a different connection
+   than the `sock'). */
+
+void silc_client_close_connection_real(SilcClient client,
+                                      SilcSocketConnection sock,
+                                      SilcClientConnection conn)
 {
-  SilcClientConnection conn;
-  const char *host;
-  SilcUInt16 port;
+  int del = FALSE;
 
-  if (!client || !stream)
-    return FALSE;
+  SILC_LOG_DEBUG(("Start"));
 
-  if (!silc_socket_stream_get_info(stream, NULL, &host, NULL, &port)) {
-    SILC_LOG_ERROR(("Socket stream does not have remote host name set"));
-    callback(client, NULL, SILC_CLIENT_CONN_ERROR, 0, NULL, context);
-    return FALSE;
+  if (!sock && !conn)
+    return;
+
+  if (!sock || (sock && conn->sock == sock))
+    del = TRUE;
+  if (!sock)
+    sock = conn->sock;
+
+  if (!sock) {
+    if (del && conn)
+      silc_client_del_connection(client, conn);
+    return;
   }
 
-  /* Add new connection */
-  conn = silc_client_add_connection(client, conn_type, params,
-                                   public_key, private_key,
-                                   (char *)host, port, callback, context);
-  if (!conn) {
-    callback(client, NULL, SILC_CLIENT_CONN_ERROR, 0, NULL, context);
-    return FALSE;
+  /* We won't listen for this connection anymore */
+  silc_schedule_unset_listen_fd(client->schedule, sock->sock);
+
+  /* Unregister all tasks */
+  silc_schedule_task_del_by_fd(client->schedule, sock->sock);
+
+  /* Close the actual connection */
+  silc_net_close_connection(sock->sock);
+
+  /* Cancel any active protocol */
+  if (sock->protocol) {
+    if (sock->protocol->protocol->type ==
+       SILC_PROTOCOL_CLIENT_KEY_EXCHANGE ||
+       sock->protocol->protocol->type ==
+       SILC_PROTOCOL_CLIENT_CONNECTION_AUTH) {
+      sock->protocol->state = SILC_PROTOCOL_STATE_ERROR;
+      silc_protocol_execute_final(sock->protocol, client->schedule);
+      /* The application will recall this function with these protocols
+        (the ops->connected client operation). */
+      return;
+    } else {
+      sock->protocol->state = SILC_PROTOCOL_STATE_ERROR;
+      silc_protocol_execute_final(sock->protocol, client->schedule);
+      sock->protocol = NULL;
+    }
   }
-  conn->stream = (void *)stream;
 
-  /* Signal connection to start key exchange */
-  conn->internal->key_exchange = TRUE;
-  return TRUE;
+  /* Free everything */
+  if (del && sock->user_data)
+    silc_client_del_connection(client, conn);
+
+  silc_socket_free(sock);
 }
 
-/* Closes remote connection */
+/* Closes the connection to the remote end */
 
 void silc_client_close_connection(SilcClient client,
                                  SilcClientConnection conn)
 {
-  SILC_LOG_DEBUG(("Closing connection %p", conn));
-
-  /* Signal to close connection */
-  if (!conn->internal->disconnected) {
-    conn->internal->disconnected = TRUE;
-    SILC_FSM_SEMA_POST(&conn->internal->wait_event);
-  }
+  silc_client_close_connection_real(client, NULL, conn);
 }
 
-#if 0
-/* Finalizes the connection to the remote SILC server. This is called
-   after authentication protocol has been completed. This send our
-   user information to the server to receive our client ID from
-   server. */
+/* Called when we receive disconnection packet from server. This
+   closes our end properly and displays the reason of the disconnection
+   on the screen. */
 
-SILC_TASK_CALLBACK(silc_client_connect_to_server_final)
+SILC_TASK_CALLBACK(silc_client_disconnected_by_server_later)
 {
-  SilcProtocol protocol = (SilcProtocol)context;
-  SilcClientConnAuthInternalContext *ctx =
-    (SilcClientConnAuthInternalContext *)protocol->context;
-  SilcClient client = (SilcClient)ctx->client;
-  SilcClientConnection conn = (SilcClientConnection)ctx->sock->user_data;
-  SilcBuffer packet;
-
-  SILC_LOG_DEBUG(("Start"));
-
-  if (protocol->state == SILC_PROTOCOL_STATE_ERROR ||
-      protocol->state == SILC_PROTOCOL_STATE_FAILURE) {
-    /* Error occured during protocol */
-    SILC_LOG_DEBUG(("Error during authentication protocol"));
-    ctx->status = SILC_CLIENT_CONN_ERROR_AUTH;
-    goto err;
-  }
-
-  if (conn->internal->params.detach_data) {
-    /* Send RESUME_CLIENT packet to the server, which is used to resume
-       old detached session back. */
-    SilcBuffer auth;
-    SilcClientID *old_client_id;
-    unsigned char *old_id;
-    SilcUInt16 old_id_len;
+  SilcClient client = (SilcClient)context;
+  SilcSocketConnection sock;
 
-    if (!silc_client_process_detach_data(client, conn, &old_id, &old_id_len)) {
-      ctx->status = SILC_CLIENT_CONN_ERROR_RESUME;
-      goto err;
-    }
+  SILC_CLIENT_GET_SOCK(client, fd, sock);
+  if (sock == NULL)
+    return;
 
-    old_client_id = silc_id_str2id(old_id, old_id_len, SILC_ID_CLIENT);
-    if (!old_client_id) {
-      silc_free(old_id);
-      ctx->status = SILC_CLIENT_CONN_ERROR_RESUME;
-      goto err;
-    }
+  silc_client_close_connection_real(client, sock, sock->user_data);
+}
 
-    /* Generate authentication data that server will verify */
-    auth = silc_auth_public_key_auth_generate(client->public_key,
-                                             client->private_key,
-                                             client->rng,
-                                             conn->internal->hash,
-                                             old_client_id, SILC_ID_CLIENT);
-    if (!auth) {
-      silc_free(old_client_id);
-      silc_free(old_id);
-      ctx->status = SILC_CLIENT_CONN_ERROR_RESUME;
-      goto err;
-    }
+/* Called when we receive disconnection packet from server. This
+   closes our end properly and displays the reason of the disconnection
+   on the screen. */
 
-    packet = silc_buffer_alloc_size(2 + old_id_len + auth->len);
-    silc_buffer_format(packet,
-                      SILC_STR_UI_SHORT(old_id_len),
-                      SILC_STR_UI_XNSTRING(old_id, old_id_len),
-                      SILC_STR_UI_XNSTRING(auth->data, auth->len),
-                      SILC_STR_END);
+void silc_client_disconnected_by_server(SilcClient client,
+                                       SilcSocketConnection sock,
+                                       SilcBuffer packet)
+{
+  SilcClientConnection conn;
+  SilcStatus status;
+  char *message = NULL;
 
-    /* Send the packet */
-    silc_client_packet_send(client, ctx->sock, SILC_PACKET_RESUME_CLIENT,
-                           NULL, 0, NULL, NULL,
-                           packet->data, packet->len, TRUE);
-    silc_buffer_free(packet);
-    silc_buffer_free(auth);
-    silc_free(old_client_id);
-    silc_free(old_id);
-  } else {
-    /* Send NEW_CLIENT packet to the server. We will become registered
-       to the SILC network after sending this packet and we will receive
-       client ID from the server. */
-    packet = silc_buffer_alloc(2 + 2 + strlen(client->username) +
-                              strlen(client->realname));
-    silc_buffer_pull_tail(packet, SILC_BUFFER_END(packet));
-    silc_buffer_format(packet,
-                      SILC_STR_UI_SHORT(strlen(client->username)),
-                      SILC_STR_UI_XNSTRING(client->username,
-                                           strlen(client->username)),
-                      SILC_STR_UI_SHORT(strlen(client->realname)),
-                      SILC_STR_UI_XNSTRING(client->realname,
-                                           strlen(client->realname)),
-                      SILC_STR_END);
+  SILC_LOG_DEBUG(("Server disconnected us, sock %d", sock->sock));
 
-    /* Send the packet */
-    silc_client_packet_send(client, ctx->sock, SILC_PACKET_NEW_CLIENT,
-                           NULL, 0, NULL, NULL,
-                           packet->data, packet->len, TRUE);
-    silc_buffer_free(packet);
-  }
+  if (packet->len < 1)
+    return;
 
-  /* Save remote ID. */
-  conn->remote_id = ctx->dest_id;
-  conn->remote_id_data = silc_id_id2str(ctx->dest_id, SILC_ID_SERVER);
-  conn->remote_id_data_len = silc_id_get_len(ctx->dest_id, SILC_ID_SERVER);
+  status = (SilcStatus)packet->data[0];
 
-  /* Register re-key timeout */
-  conn->internal->rekey->timeout = client->internal->params->rekey_secs;
-  conn->internal->rekey->context = (void *)client;
-  silc_schedule_task_add(client->schedule, conn->sock->sock,
-                        silc_client_rekey_callback,
-                        (void *)conn->sock, conn->internal->rekey->timeout, 0,
-                        SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+  if (packet->len > 1 &&
+      silc_utf8_valid(packet->data + 1, packet->len - 1))
+    message = silc_memdup(packet->data + 1, packet->len - 1);
 
-  silc_protocol_free(protocol);
-  silc_free(ctx->auth_data);
-  if (ctx->ske)
-    silc_ske_free(ctx->ske);
-  silc_socket_free(ctx->sock);
-  silc_free(ctx);
-  conn->sock->protocol = NULL;
-  return;
+  conn = (SilcClientConnection)sock->user_data;
+  if (sock == conn->sock && sock->type != SILC_SOCKET_TYPE_CLIENT)
+    client->internal->ops->disconnected(client, conn, status, message);
 
- err:
-  silc_protocol_free(protocol);
-  silc_free(ctx->auth_data);
-  silc_free(ctx->dest_id);
-  if (ctx->ske)
-    silc_ske_free(ctx->ske);
-  conn->sock->protocol = NULL;
-  silc_socket_free(ctx->sock);
+  silc_free(message);
 
-  /* Notify application of failure */
-  silc_schedule_task_add(client->schedule, ctx->sock->sock,
-                        silc_client_connect_failure_auth, ctx,
-                        0, 1, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+  SILC_SET_DISCONNECTED(sock);
+
+  /* Close connection through scheduler. */
+  silc_schedule_task_add(client->schedule, sock->sock,
+                        silc_client_disconnected_by_server_later,
+                        client, 0, 1, SILC_TASK_TIMEOUT,
+                        SILC_TASK_PRI_NORMAL);
+}
+
+/* Received error message from server. Display it on the screen.
+   We don't take any action what so ever of the error message. */
+
+void silc_client_error_by_server(SilcClient client,
+                                SilcSocketConnection sock,
+                                SilcBuffer message)
+{
+  char *msg;
+
+  msg = silc_memdup(message->data, message->len);
+  client->internal->ops->say(client, sock->user_data,
+                            SILC_CLIENT_MESSAGE_AUDIT, msg);
+  silc_free(msg);
+}
+
+/* Auto-nicking callback to send NICK command to server. */
+
+SILC_TASK_CALLBACK(silc_client_send_auto_nick)
+{
+  SilcClientConnection conn = (SilcClientConnection)context;
+  SilcClient client = conn->client;
+  if (client)
+    silc_client_command_send(client, conn, SILC_COMMAND_NICK,
+                            ++conn->cmd_ident, 1, 1,
+                            client->nickname, strlen(client->nickname));
 }
 
 /* Client session resuming callback.  If the session was resumed
@@ -830,7 +1713,7 @@ SILC_TASK_CALLBACK(silc_client_connect_to_server_final)
 
 static void silc_client_resume_session_cb(SilcClient client,
                                          SilcClientConnection conn,
-                                         SilcBool success,
+                                         bool success,
                                          void *context)
 {
   SilcBuffer sidp;
@@ -853,13 +1736,273 @@ static void silc_client_resume_session_cb(SilcClient client,
   }
 }
 
+/* Processes the received new Client ID from server. Old Client ID is
+   deleted from cache and new one is added. */
+
+void silc_client_receive_new_id(SilcClient client,
+                               SilcSocketConnection sock,
+                               SilcIDPayload idp)
+{
+  SilcClientConnection conn = (SilcClientConnection)sock->user_data;
+  int connecting = FALSE;
+  SilcClientID *client_id = silc_id_payload_get_id(idp);
+  char *nickname;
+
+  if (!conn->local_entry)
+    connecting = TRUE;
+
+  /* Delete old ID from ID cache */
+  if (conn->local_id) {
+    /* Check whether they are different */
+    if (SILC_ID_CLIENT_COMPARE(conn->local_id, client_id)) {
+      silc_free(client_id);
+      return;
+    }
+
+    silc_idcache_del_by_context(conn->internal->client_cache,
+                               conn->local_entry);
+    silc_free(conn->local_id);
+  }
+
+  /* Save the new ID */
+
+  if (conn->local_id_data)
+    silc_free(conn->local_id_data);
+
+  conn->local_id = client_id;
+  conn->local_id_data = silc_id_payload_get_data(idp);
+  conn->local_id_data_len = silc_id_payload_get_len(idp);;
+
+  if (!conn->local_entry)
+    conn->local_entry = silc_calloc(1, sizeof(*conn->local_entry));
+
+  conn->local_entry->nickname = conn->nickname;
+  if (!conn->local_entry->username)
+    conn->local_entry->username = strdup(client->username);
+  if (!conn->local_entry->server)
+    conn->local_entry->server = strdup(conn->remote_host);
+  conn->local_entry->id = conn->local_id;
+  conn->local_entry->valid = TRUE;
+  if (!conn->local_entry->channels)
+    conn->local_entry->channels = silc_hash_table_alloc(1, silc_hash_ptr,
+                                                       NULL, NULL,
+                                                       NULL, NULL, NULL,
+                                                       TRUE);
+
+  /* Normalize nickname */
+  nickname = silc_identifier_check(conn->nickname, strlen(conn->nickname),
+                                  SILC_STRING_UTF8, 128, NULL);
+  if (!nickname)
+    return;
+
+    /* Put it to the ID cache */
+  silc_idcache_add(conn->internal->client_cache, nickname, conn->local_id,
+                  (void *)conn->local_entry, 0, NULL);
+
+  if (connecting) {
+    SilcBuffer sidp;
+
+    /* Issue IDENTIFY command for itself to get resolved hostname
+       correctly from server. */
+    silc_client_command_register(client, SILC_COMMAND_IDENTIFY, NULL, NULL,
+                                silc_client_command_reply_identify_i, 0,
+                                ++conn->cmd_ident);
+    sidp = silc_id_payload_encode(conn->local_entry->id, SILC_ID_CLIENT);
+    silc_client_command_send(client, conn, SILC_COMMAND_IDENTIFY,
+                            conn->cmd_ident, 1, 5, sidp->data, sidp->len);
+    silc_buffer_free(sidp);
+
+    if (!conn->internal->params.detach_data) {
+      /* Send NICK command if the nickname was set by the application (and is
+        not same as the username). Send this with little timeout. */
+      if (client->nickname &&
+         !silc_utf8_strcasecmp(client->nickname, client->username))
+       silc_schedule_task_add(client->schedule, 0,
+                              silc_client_send_auto_nick, conn,
+                              1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+
+      /* Notify application of successful connection. We do it here now that
+        we've received the Client ID and are allowed to send traffic. */
+      client->internal->ops->connected(client, conn, SILC_CLIENT_CONN_SUCCESS);
+
+      /* Issue INFO command to fetch the real server name and server
+        information and other stuff. */
+      silc_client_command_register(client, SILC_COMMAND_INFO, NULL, NULL,
+                                  silc_client_command_reply_info_i, 0,
+                                  ++conn->cmd_ident);
+      sidp = silc_id_payload_encode(conn->remote_id, SILC_ID_SERVER);
+      silc_client_command_send(client, conn, SILC_COMMAND_INFO,
+                              conn->cmd_ident, 1, 2, sidp->data, sidp->len);
+      silc_buffer_free(sidp);
+    } else {
+      /* We are resuming session.  Start resolving informations from the
+        server we need to set the client libary in the state before
+        detaching the session.  The connect client operation is called
+        after this is successfully completed */
+      silc_client_resume_session(client, conn, silc_client_resume_session_cb,
+                                NULL);
+    }
+  }
+}
+
+/* Removes a client entry from all channels it has joined. */
+
+void silc_client_remove_from_channels(SilcClient client,
+                                     SilcClientConnection conn,
+                                     SilcClientEntry client_entry)
+{
+  SilcHashTableList htl;
+  SilcChannelUser chu;
+
+  silc_hash_table_list(client_entry->channels, &htl);
+  while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
+    silc_hash_table_del(chu->client->channels, chu->channel);
+    silc_hash_table_del(chu->channel->user_list, chu->client);
+    silc_free(chu);
+  }
+
+  silc_hash_table_list_reset(&htl);
+}
+
+/* Replaces `old' client entries from all channels to `new' client entry.
+   This can be called for example when nickname changes and old ID entry
+   is replaced from ID cache with the new one. If the old ID entry is only
+   updated, then this fucntion needs not to be called. */
+
+void silc_client_replace_from_channels(SilcClient client,
+                                      SilcClientConnection conn,
+                                      SilcClientEntry old,
+                                      SilcClientEntry new)
+{
+  SilcHashTableList htl;
+  SilcChannelUser chu;
+
+  silc_hash_table_list(old->channels, &htl);
+  while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
+    /* Replace client entry */
+    silc_hash_table_del(chu->client->channels, chu->channel);
+    silc_hash_table_del(chu->channel->user_list, chu->client);
+
+    chu->client = new;
+    silc_hash_table_add(chu->channel->user_list, chu->client, chu);
+    silc_hash_table_add(chu->client->channels, chu->channel, chu);
+  }
+  silc_hash_table_list_reset(&htl);
+}
+
+/* Registers failure timeout to process the received failure packet
+   with timeout. */
+
+void silc_client_process_failure(SilcClient client,
+                                SilcSocketConnection sock,
+                                SilcPacketContext *packet)
+{
+  SilcUInt32 failure = 0;
+
+  if (sock->protocol) {
+    if (packet->buffer->len >= 4)
+      SILC_GET32_MSB(failure, packet->buffer->data);
+
+    /* Notify application */
+    client->internal->ops->failure(client, sock->user_data, sock->protocol,
+                                  SILC_32_TO_PTR(failure));
+  }
+}
+
+/* A timeout callback for the re-key. We will be the initiator of the
+   re-key protocol. */
+
+SILC_TASK_CALLBACK_GLOBAL(silc_client_rekey_callback)
+{
+  SilcSocketConnection sock = (SilcSocketConnection)context;
+  SilcClientConnection conn = (SilcClientConnection)sock->user_data;
+  SilcClient client = (SilcClient)conn->internal->rekey->context;
+  SilcProtocol protocol;
+  SilcClientRekeyInternalContext *proto_ctx;
+
+  SILC_LOG_DEBUG(("Start"));
+
+  /* If rekey protocol is active already wait for it to finish */
+  if (sock->protocol && sock->protocol->protocol &&
+      sock->protocol->protocol->type == SILC_PROTOCOL_CLIENT_REKEY)
+    return;
+
+  /* Allocate internal protocol context. This is sent as context
+     to the protocol. */
+  proto_ctx = silc_calloc(1, sizeof(*proto_ctx));
+  proto_ctx->client = (void *)client;
+  proto_ctx->sock = silc_socket_dup(sock);
+  proto_ctx->responder = FALSE;
+  proto_ctx->pfs = conn->internal->rekey->pfs;
+
+  /* Perform rekey protocol. Will call the final callback after the
+     protocol is over. */
+  silc_protocol_alloc(SILC_PROTOCOL_CLIENT_REKEY,
+                     &protocol, proto_ctx, silc_client_rekey_final);
+  sock->protocol = protocol;
+
+  /* Run the protocol */
+  silc_protocol_execute(protocol, client->schedule, 0, 0);
+}
+
+/* The final callback for the REKEY protocol. This will actually take the
+   new key material into use. */
+
+SILC_TASK_CALLBACK(silc_client_rekey_final)
+{
+  SilcProtocol protocol = (SilcProtocol)context;
+  SilcClientRekeyInternalContext *ctx =
+    (SilcClientRekeyInternalContext *)protocol->context;
+  SilcClient client = (SilcClient)ctx->client;
+  SilcSocketConnection sock = ctx->sock;
+  SilcClientConnection conn = (SilcClientConnection)sock->user_data;
+
+  SILC_LOG_DEBUG(("Start"));
+
+  if (protocol->state == SILC_PROTOCOL_STATE_ERROR ||
+      protocol->state == SILC_PROTOCOL_STATE_FAILURE) {
+    /* Error occured during protocol */
+    silc_protocol_cancel(protocol, client->schedule);
+    silc_protocol_free(protocol);
+    sock->protocol = NULL;
+    if (ctx->packet)
+      silc_packet_context_free(ctx->packet);
+    if (ctx->ske)
+      silc_ske_free(ctx->ske);
+    silc_socket_free(ctx->sock);
+    silc_free(ctx);
+    return;
+  }
+
+  /* Purge the outgoing data queue to assure that all rekey packets really
+     go to the network before we quit the protocol. */
+  silc_client_packet_queue_purge(client, sock);
+
+  /* Re-register re-key timeout */
+  if (ctx->responder == FALSE)
+    silc_schedule_task_add(client->schedule, sock->sock,
+                          silc_client_rekey_callback,
+                          sock, conn->internal->rekey->timeout, 0,
+                          SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+
+  /* Cleanup */
+  silc_protocol_free(protocol);
+  sock->protocol = NULL;
+  if (ctx->packet)
+    silc_packet_context_free(ctx->packet);
+  if (ctx->ske)
+    silc_ske_free(ctx->ske);
+  silc_socket_free(ctx->sock);
+  silc_free(ctx);
+}
+
 /* Processes incoming connection authentication method request packet.
    It is a reply to our previously sent request. The packet can be used
    to resolve the authentication method for the current session if the
    client does not know it beforehand. */
 
 void silc_client_connection_auth_request(SilcClient client,
-                                        SilcClientConnection conn,
+                                        SilcSocketConnection sock,
                                         SilcPacketContext *packet)
 {
   SilcClientConnection conn = (SilcClientConnection)sock->user_data;
@@ -958,199 +2101,3 @@ silc_client_request_authentication_method(SilcClient client,
                           client->internal->params->connauth_request_secs, 0,
                           SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
 }
-#endif /* 0 */
-
-
-/* Allocates new client object. This has to be done before client may
-   work. After calling this one must call silc_client_init to initialize
-   the client. The `application' is application specific user data pointer
-   and caller must free it. */
-
-SilcClient silc_client_alloc(SilcClientOperations *ops,
-                            SilcClientParams *params,
-                            void *application,
-                            const char *version_string)
-{
-  SilcClient new_client;
-
-  new_client = silc_calloc(1, sizeof(*new_client));
-  if (!new_client)
-    return NULL;
-  new_client->application = application;
-
-  new_client->internal = silc_calloc(1, sizeof(*new_client->internal));
-  if (!new_client->internal) {
-    silc_free(new_client);
-    return NULL;
-  }
-  new_client->internal->ops = ops;
-  new_client->internal->params =
-    silc_calloc(1, sizeof(*new_client->internal->params));
-  if (!version_string)
-    version_string = silc_version_string;
-  new_client->internal->silc_client_version = strdup(version_string);
-
-  if (params)
-    memcpy(new_client->internal->params, params, sizeof(*params));
-
-  if (!new_client->internal->params->rekey_secs)
-    new_client->internal->params->rekey_secs = 3600;
-
-  if (!new_client->internal->params->connauth_request_secs)
-    new_client->internal->params->connauth_request_secs = 2;
-
-  new_client->internal->params->
-    nickname_format[sizeof(new_client->internal->
-                          params->nickname_format) - 1] = 0;
-
-  return new_client;
-}
-
-/* Frees client object and its internals. */
-
-void silc_client_free(SilcClient client)
-{
-  if (client->rng)
-    silc_rng_free(client->rng);
-
-  if (!client->internal->params->dont_register_crypto_library) {
-    silc_cipher_unregister_all();
-    silc_pkcs_unregister_all();
-    silc_hash_unregister_all();
-    silc_hmac_unregister_all();
-  }
-
-  silc_free(client->username);
-  silc_free(client->hostname);
-  silc_free(client->realname);
-  silc_free(client->internal->params);
-  silc_free(client->internal->silc_client_version);
-  silc_free(client->internal);
-  silc_free(client);
-}
-
-/* Initializes the client. This makes all the necessary steps to make
-   the client ready to be run. One must call silc_client_run to run the
-   client. Returns FALSE if error occured, TRUE otherwise. */
-
-SilcBool silc_client_init(SilcClient client, const char *username,
-                         const char *hostname, const char *realname)
-{
-  SILC_LOG_DEBUG(("Initializing client"));
-
-  if (!client)
-    return FALSE;
-
-  if (!username || !hostname) {
-    SILC_LOG_ERROR(("Username, hostname and realname must be given to "
-                   "silc_client_init"));
-    return FALSE;
-  }
-  if (!realname)
-    realname = username;
-
-  /* Validate essential strings */
-  if (!silc_identifier_verify(username, strlen(username),
-                             SILC_STRING_UTF8, 128)) {
-    SILC_LOG_ERROR(("Malformed username '%s'. Username must be UTF-8 string",
-                   client->username));
-    return FALSE;
-  }
-  if (!silc_identifier_verify(hostname, strlen(hostname),
-                             SILC_STRING_UTF8, 256)) {
-    SILC_LOG_ERROR(("Malformed hostname '%s'. Hostname must be UTF-8 string",
-                   client->hostname));
-    return FALSE;
-  }
-  if (!silc_utf8_valid(realname, strlen(realname))) {
-    SILC_LOG_ERROR(("Malformed realname '%s'. Realname must be UTF-8 string",
-                   client->realname));
-    return FALSE;
-  }
-
-  /* Take the name strings */
-  client->username = strdup(username);
-  client->hostname = strdup(hostname);
-  client->realname = strdup(realname);
-  if (!username || !hostname || !realname)
-    return FALSE;
-
-  if (!client->internal->params->dont_register_crypto_library) {
-    /* Initialize the crypto library.  If application has done this already
-       this has no effect.  Also, we will not be overriding something
-       application might have registered earlier. */
-    silc_cipher_register_default();
-    silc_pkcs_register_default();
-    silc_hash_register_default();
-    silc_hmac_register_default();
-  }
-
-  /* Initialize random number generator */
-  client->rng = silc_rng_alloc();
-  if (!client->rng)
-    return FALSE;
-  silc_rng_init(client->rng);
-  silc_rng_global_init(client->rng);
-
-  /* Initialize the scheduler */
-  client->schedule = silc_schedule_init(0, client);
-  if (!client->schedule)
-    return FALSE;
-
-  /* Start packet engine */
-  client->internal->packet_engine =
-    silc_packet_engine_start(client->rng, FALSE, &silc_client_stream_cbs,
-                            client);
-  if (!client->internal->packet_engine)
-    return FALSE;
-
-  /* Allocate client lock */
-  silc_mutex_alloc(&client->internal->lock);
-
-  /* Register commands */
-  silc_client_commands_register(client);
-
-  /* Initialize and start the client FSM */
-  silc_fsm_init(&client->internal->fsm, client, NULL, NULL, client->schedule);
-  silc_fsm_sema_init(&client->internal->wait_event, &client->internal->fsm, 0);
-  silc_fsm_start_sync(&client->internal->fsm, silc_client_st_run);
-
-  /* Signal the application when we are running */
-  client->internal->run_callback = TRUE;
-  SILC_FSM_SEMA_POST(&client->internal->wait_event);
-
-  return TRUE;
-}
-
-/* Stops the client. This is called to stop the client and thus to stop
-   the program. */
-
-void silc_client_stop(SilcClient client)
-{
-  SILC_LOG_DEBUG(("Stopping client"));
-
-  silc_schedule_stop(client->schedule);
-  silc_schedule_uninit(client->schedule);
-  silc_client_commands_unregister(client);
-
-  SILC_LOG_DEBUG(("Client stopped"));
-}
-
-/* Starts the SILC client FSM machine and blocks here.  When this returns
-   the client has ended. */
-
-void silc_client_run(SilcClient client)
-{
-  SILC_LOG_DEBUG(("Starting SILC client"));
-
-  /* Run the scheduler */
-  silc_schedule(client->schedule);
-}
-
-/* Call scheduler one iteration and return.  This cannot be called if threads
-   are in use. */
-
-void silc_client_run_one(SilcClient client)
-{
-  silc_schedule_one(client->schedule, 0);
-}