updates.
[silc.git] / lib / silcclient / idlist.c
index 5085c39202ae56a3c2339e6ebf80bc94534dfc17..2c520d148031f9cc3a4611145d4dc9fcad805ec0 100644 (file)
@@ -2,9 +2,9 @@
 
   idlist.c
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2000 Pekka Riikonen
+  Copyright (C) 2001 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 "clientlibincludes.h"
+#include "client_internal.h"
+
+/******************************************************************************
+
+                         Client Searching Locally
+
+******************************************************************************/
+
+/* Same as silc_client_get_clients function but does not resolve anything
+   from the server. This checks local cache and returns all matching
+   clients from the local cache. If none was found this returns NULL.
+   The `nickname' is the real nickname of the client, and the `format'
+   is the formatted nickname to find exact match from multiple found
+   entries. The format must be same as given in the SilcClientParams
+   structure to the client library. If the `format' is NULL all found
+   clients by `nickname' are returned. */
+
+SilcClientEntry *silc_client_get_clients_local(SilcClient client,
+                                              SilcClientConnection conn,
+                                              const char *nickname,
+                                              const char *format,
+                                              uint32 *clients_count)
+{
+  SilcIDCacheEntry id_cache;
+  SilcIDCacheList list = NULL;
+  SilcClientEntry entry, *clients;
+  int i = 0;
+  bool found = FALSE;
+
+  /* Find ID from cache */
+  if (!silc_idcache_find_by_name(conn->client_cache, (char *)nickname, &list))
+    return NULL;
+
+  if (!silc_idcache_list_count(list)) {
+    silc_idcache_list_free(list);
+    return NULL;
+  }
+
+  clients = silc_calloc(silc_idcache_list_count(list), sizeof(*clients));
+  *clients_count = silc_idcache_list_count(list);
+
+  if (!format) {
+    /* Take all without any further checking */
+    silc_idcache_list_first(list, &id_cache);
+    while (id_cache) {
+      clients[i++] = id_cache->context;
+      found = TRUE;
+      if (!silc_idcache_list_next(list, &id_cache))
+       break;
+    }
+  } else {
+    /* Check multiple cache entries for match */
+    silc_idcache_list_first(list, &id_cache);
+    while (id_cache) {
+      entry = (SilcClientEntry)id_cache->context;
+      if (strcasecmp(entry->nickname, format)) {
+       if (!silc_idcache_list_next(list, &id_cache)) {
+         break;
+       } else {
+         continue;
+       }
+      }
+      
+      clients[i++] = id_cache->context;
+      found = TRUE;
+      if (!silc_idcache_list_next(list, &id_cache))
+       break;
+    }
+  }
+
+  if (list)
+    silc_idcache_list_free(list);
+
+  if (!found) {
+    *clients_count = 0;
+    if (clients)
+      silc_free(clients);
+    return NULL;
+  }
+
+  return clients;
+}
+
+
+/******************************************************************************
+
+                        Client Resolving from Server
+
+******************************************************************************/
 
 typedef struct {
-  SilcClientCommandContext cmd;
+  SilcClient client;
+  SilcClientConnection conn;
   SilcGetClientCallback completion;
+  void *context;
   char *nickname;
   char *server;
-  void *context;
-  int found;
+  bool found;
 } *GetClientInternal;
 
 SILC_CLIENT_CMD_FUNC(get_client_callback)
@@ -37,11 +127,11 @@ SILC_CLIENT_CMD_FUNC(get_client_callback)
   uint32 clients_count;
 
   /* Get the clients */
-  clients = silc_client_get_clients_local(i->cmd->client, i->cmd->conn,
+  clients = silc_client_get_clients_local(i->client, i->conn,
                                          i->nickname, i->server,
                                          &clients_count);
   if (clients) {
-    i->completion(i->cmd->client, i->cmd->conn, clients, 
+    i->completion(i->client, i->conn, clients, 
                  clients_count, i->context);
     i->found = TRUE;
     silc_free(clients);
@@ -53,13 +143,10 @@ static void silc_client_get_client_destructor(void *context)
   GetClientInternal i = (GetClientInternal)context;
 
   if (i->found == FALSE)
-    i->completion(i->cmd->client, i->cmd->conn, NULL, 0, i->context);
+    i->completion(i->client, i->conn, NULL, 0, i->context);
 
-  silc_client_command_free(i->cmd);
-  if (i->nickname)
-    silc_free(i->nickname);
-  if (i->server)
-    silc_free(i->server);
+  silc_free(i->nickname);
+  silc_free(i->server);
   silc_free(i);
 }
 
@@ -74,104 +161,135 @@ static void silc_client_get_client_destructor(void *context)
 
 void silc_client_get_clients(SilcClient client,
                             SilcClientConnection conn,
-                            char *nickname,
-                            char *server,
+                            const char *nickname,
+                            const char *server,
                             SilcGetClientCallback completion,
                             void *context)
 {
-  char ident[512];
-  SilcClientCommandContext ctx;
-  GetClientInternal i = silc_calloc(1, sizeof(*i));
-      
-  /* No ID found. Do query from the server. The query is done by 
-     sending simple IDENTIFY command to the server. */
-  ctx = silc_client_command_alloc();
-  ctx->client = client;
-  ctx->conn = conn;
-  ctx->command = silc_client_command_find("IDENTIFY");
-  memset(ident, 0, sizeof(ident));
-  snprintf(ident, sizeof(ident), "IDENTIFY %s", nickname);
-  silc_parse_command_line(ident, &ctx->argv, &ctx->argv_lens, 
-                         &ctx->argv_types, &ctx->argc, 2);
-
-  i->cmd = silc_client_command_dup(ctx);
-  i->nickname = nickname ? strdup(nickname) : NULL;
+  GetClientInternal i;
+  char *userhost;
+
+  if (!nickname)
+    return;
+
+  i = silc_calloc(1, sizeof(*i));
+  i->client = client;
+  i->conn = conn;
+  i->nickname = strdup(nickname);
   i->server = server ? strdup(server) : NULL;
   i->completion = completion;
   i->context = context;
 
-  /* Call the command */
-  ctx->command->cb(ctx, NULL);
+  if (nickname && server) {
+    userhost = silc_calloc(strlen(nickname) + strlen(server) + 2,
+                          sizeof(*userhost));
+    strncat(userhost, nickname, strlen(nickname));
+    strncat(userhost, "@", 1);
+    strncat(userhost, server, strlen(server));
+  } else {
+    userhost = strdup(nickname);
+  }
+
+  /* Register our own command reply for this command */
+  silc_client_command_register(client, SILC_COMMAND_IDENTIFY, NULL, NULL,
+                              silc_client_command_reply_identify_i, 0,
+                              ++conn->cmd_ident);
+
+  /* Send the command */
+  silc_client_command_send(client, conn, SILC_COMMAND_IDENTIFY, 
+                          conn->cmd_ident, 1, 1, userhost, 
+                          strlen(userhost));
 
   /* Add pending callback */
-  silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, 
-                             conn->cmd_ident, 
+  silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident,
                              silc_client_get_client_destructor,
                              silc_client_command_get_client_callback, 
                              (void *)i);
+
+  silc_free(userhost);
 }
 
-/* Same as above function but does not resolve anything from the server.
-   This checks local cache and returns all clients from the cache. */
+/* The old style function to find client entry. This is used by the
+   library internally. If `query' is TRUE then the client information is
+   requested by the server. The pending command callback must be set
+   by the caller. */
+/* XXX This function should be removed */
 
-SilcClientEntry *silc_client_get_clients_local(SilcClient client,
-                                              SilcClientConnection conn,
-                                              char *nickname,
-                                              char *server,
-                                              uint32 *clients_count)
+SilcClientEntry silc_idlist_get_client(SilcClient client,
+                                      SilcClientConnection conn,
+                                      const char *nickname,
+                                      const char *format,
+                                      bool query)
 {
   SilcIDCacheEntry id_cache;
   SilcIDCacheList list = NULL;
-  SilcClientEntry entry, *clients;
-  int i = 0;
+  SilcClientEntry entry = NULL;
+
+  SILC_LOG_DEBUG(("Start"));
 
   /* Find ID from cache */
-  if (!silc_idcache_find_by_name(conn->client_cache, nickname, &list))
-    return NULL;
+  if (!silc_idcache_find_by_name(conn->client_cache, (char *)nickname, 
+                                &list)) {
+  identify:
 
-  if (!silc_idcache_list_count(list)) {
-    silc_idcache_list_free(list);
+    if (query) {
+      SILC_LOG_DEBUG(("Requesting Client ID from server"));
+      
+      /* Register our own command reply for this command */
+      silc_client_command_register(client, SILC_COMMAND_IDENTIFY, NULL, NULL,
+                                  silc_client_command_reply_identify_i, 0,
+                                  ++conn->cmd_ident);
+
+      /* Send the command */
+      silc_client_command_send(client, conn, SILC_COMMAND_IDENTIFY, 
+                              conn->cmd_ident, 1, 1, nickname,
+                              strlen(nickname));
+
+      if (list)
+       silc_idcache_list_free(list);
+
+      return NULL;
+    }
     return NULL;
   }
 
-  clients = silc_calloc(silc_idcache_list_count(list), sizeof(*clients));
-  *clients_count = silc_idcache_list_count(list);
+  if (!format) {
+    /* Take first found cache entry */
+    if (!silc_idcache_list_first(list, &id_cache))
+      goto identify;
 
-  if (!server) {
-    /* Take all without any further checking */
-    silc_idcache_list_first(list, &id_cache);
-    while (id_cache) {
-      clients[i++] = id_cache->context;
-      if (!silc_idcache_list_next(list, &id_cache))
-       break;
-    }
+    entry = (SilcClientEntry)id_cache->context;
   } else {
     /* Check multiple cache entries for match */
     silc_idcache_list_first(list, &id_cache);
     while (id_cache) {
       entry = (SilcClientEntry)id_cache->context;
-      
-      if (entry->server && 
-         strncasecmp(server, entry->server, strlen(server))) {
+
+      if (strcasecmp(entry->nickname, format)) {
        if (!silc_idcache_list_next(list, &id_cache)) {
+         entry = NULL;
          break;
        } else {
+         entry = NULL;
          continue;
        }
       }
-      
-      clients[i++] = id_cache->context;
-      if (!silc_idcache_list_next(list, &id_cache))
-       break;
+
+      break;
     }
+
+    /* If match weren't found, request it */
+    if (!entry)
+      goto identify;
   }
 
   if (list)
     silc_idcache_list_free(list);
 
-  return clients;
+  return entry;
 }
 
+
 typedef struct {
   SilcClient client;
   SilcClientConnection conn;
@@ -191,6 +309,8 @@ SILC_CLIENT_CMD_FUNC(get_clients_list_callback)
   uint32 clients_count = 0;
   int c;
 
+  SILC_LOG_DEBUG(("Start"));
+
   for (c = 0; c < i->list_count; c++) {
     uint16 idp_len;
     SilcClientID *client_id;
@@ -199,8 +319,10 @@ SILC_CLIENT_CMD_FUNC(get_clients_list_callback)
     SILC_GET16_MSB(idp_len, client_id_list->data + 2);
     idp_len += 4;
     client_id = silc_id_payload_parse_id(client_id_list->data, idp_len);
-    if (!client_id)
+    if (!client_id) {
+      silc_buffer_pull(client_id_list, idp_len);
       continue;
+    }
 
     /* Get the client entry */
     if (silc_idcache_find_by_id_one_ext(i->conn->client_cache, 
@@ -229,6 +351,8 @@ static void silc_client_get_clients_list_destructor(void *context)
 {
   GetClientsByListInternal i = (GetClientsByListInternal)context;
 
+  SILC_LOG_DEBUG(("Start"));
+
   if (i->found == FALSE)
     i->completion(i->client, i->conn, NULL, 0, i->context);
 
@@ -257,6 +381,8 @@ void silc_client_get_clients_by_list(SilcClient client,
   uint32 *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0;
   GetClientsByListInternal in;
 
+  SILC_LOG_DEBUG(("Start"));
+
   in = silc_calloc(1, sizeof(*in));
   in->client = client;
   in->conn = conn;
@@ -274,8 +400,10 @@ void silc_client_get_clients_by_list(SilcClient client,
     SILC_GET16_MSB(idp_len, client_id_list->data + 2);
     idp_len += 4;
     client_id = silc_id_payload_parse_id(client_id_list->data, idp_len);
-    if (!client_id)
+    if (!client_id) {
+      silc_buffer_pull(client_id_list, idp_len);
       continue;
+    }
 
     /* Check if we have this client cached already. */
     id_cache = NULL;
@@ -288,6 +416,18 @@ void silc_client_get_clients_by_list(SilcClient client,
        it from the server. */
     entry = id_cache ? (SilcClientEntry)id_cache->context : NULL;
     if (!id_cache || !entry->nickname) {
+
+      if (entry) {
+       if (entry->status & SILC_CLIENT_STATUS_RESOLVING) {
+         entry->status &= ~SILC_CLIENT_STATUS_RESOLVING;
+         silc_free(client_id);
+         silc_buffer_pull(client_id_list, idp_len);
+         continue;
+       }
+
+       entry->status |= SILC_CLIENT_STATUS_RESOLVING;
+      }
+
       /* No we don't have it, query it from the server. Assemble argument
         table that will be sent fr the IDENTIFY command later. */
       res_argv = silc_realloc(res_argv, sizeof(*res_argv) *
@@ -319,8 +459,13 @@ void silc_client_get_clients_by_list(SilcClient client,
                            NULL, 0, NULL, NULL, res_cmd->data, res_cmd->len,
                            TRUE);
 
-    silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, 
-                               conn->cmd_ident, 
+    /* Register our own command reply for this command */
+    silc_client_command_register(client, SILC_COMMAND_IDENTIFY, NULL, NULL,
+                                silc_client_command_reply_identify_i, 0,
+                                conn->cmd_ident);
+
+    /* Process the applications request after reply has been received  */
+    silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident,
                                silc_client_get_clients_list_destructor,
                                silc_client_command_get_clients_list_callback, 
                                (void *)in);
@@ -341,90 +486,6 @@ void silc_client_get_clients_by_list(SilcClient client,
   silc_client_command_get_clients_list_callback((void *)in, NULL);
 }
 
-/* The old style function to find client entry. This is used by the
-   library internally. If `query' is TRUE then the client information is
-   requested by the server. The pending command callback must be set
-   by the caller. */
-
-SilcClientEntry silc_idlist_get_client(SilcClient client,
-                                      SilcClientConnection conn,
-                                      char *nickname,
-                                      char *server,
-                                      uint32 num,
-                                      int query)
-{
-  SilcIDCacheEntry id_cache;
-  SilcIDCacheList list = NULL;
-  SilcClientEntry entry = NULL;
-
-  /* Find ID from cache */
-  if (!silc_idcache_find_by_name(conn->client_cache, nickname, &list)) {
-  identify:
-
-    if (query) {
-      char ident[512];
-      SilcClientCommandContext ctx;
-      
-      SILC_LOG_DEBUG(("Requesting Client ID from server"));
-      
-      /* No ID found. Do query from the server. The query is done by 
-        sending simple IDENTIFY command to the server. */
-      ctx = silc_client_command_alloc();
-      ctx->client = client;
-      ctx->conn = conn;
-      ctx->command = silc_client_command_find("IDENTIFY");
-      memset(ident, 0, sizeof(ident));
-      snprintf(ident, sizeof(ident), "IDENTIFY %s", nickname);
-      silc_parse_command_line(ident, &ctx->argv, &ctx->argv_lens, 
-                             &ctx->argv_types, &ctx->argc, 2);
-      ctx->command->cb(ctx, NULL);
-      
-      if (list)
-       silc_idcache_list_free(list);
-
-      return NULL;
-    }
-    return NULL;
-  }
-
-  if (!server && !num) {
-    /* Take first found cache entry */
-    if (!silc_idcache_list_first(list, &id_cache))
-      goto identify;
-
-    entry = (SilcClientEntry)id_cache->context;
-  } else {
-    /* Check multiple cache entries for match */
-    silc_idcache_list_first(list, &id_cache);
-    entry = (SilcClientEntry)id_cache->context;
-    
-    while (entry) {
-      if (server && entry->server && 
-         !strncasecmp(server, entry->server, strlen(server)))
-       break;
-      
-      if (num && entry->num == num)
-       break;
-
-      if (!silc_idcache_list_next(list, &id_cache)) {
-       entry = NULL;
-       break;
-      }
-
-      entry = (SilcClientEntry)id_cache->context;
-    }
-
-    /* If match weren't found, request it */
-    if (!entry)
-      goto identify;
-  }
-
-  if (list)
-    silc_idcache_list_free(list);
-
-  return entry;
-}
-
 /* Finds entry for client by the client's ID. Returns the entry or NULL
    if the entry was not found. */
 
@@ -497,11 +558,7 @@ void silc_client_get_client_by_id_resolve(SilcClient client,
   SilcBuffer idp;
   GetClientByIDInternal i = silc_calloc(1, sizeof(*i));
 
-  idp = silc_id_payload_encode(client_id, SILC_ID_CLIENT);
-  silc_client_send_command(client, conn, SILC_COMMAND_WHOIS, 
-                          ++conn->cmd_ident,
-                          1, 3, idp->data, idp->len);
-  silc_buffer_free(idp);
+  SILC_LOG_DEBUG(("Start"));
 
   i->client = client;
   i->conn = conn;
@@ -509,29 +566,131 @@ void silc_client_get_client_by_id_resolve(SilcClient client,
   i->completion = completion;
   i->context = context;
       
+  /* Register our own command reply for this command */
+  silc_client_command_register(client, SILC_COMMAND_WHOIS, NULL, NULL,
+                              silc_client_command_reply_whois_i, 0,
+                              ++conn->cmd_ident);
+
+  /* Send the command */
+  idp = silc_id_payload_encode(client_id, SILC_ID_CLIENT);
+  silc_client_command_send(client, conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
+                          1, 3, idp->data, idp->len);
+  silc_buffer_free(idp);
+
   /* Add pending callback */
-  silc_client_command_pending(conn, SILC_COMMAND_WHOIS, 
-                             conn->cmd_ident, 
+  silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
                              silc_client_get_client_by_id_destructor,
                              silc_client_command_get_client_by_id_callback, 
                              (void *)i);
 }
 
+
+/******************************************************************************
+
+                Client, Channel and Server entry manipulation
+
+******************************************************************************/
+
+
+/* Creates new client entry and adds it to the ID cache. Returns pointer
+   to the new entry. */
+
+SilcClientEntry
+silc_client_add_client(SilcClient client, SilcClientConnection conn,
+                      char *nickname, char *username, 
+                      char *userinfo, SilcClientID *id, uint32 mode)
+{
+  SilcClientEntry client_entry;
+  char *nick = NULL;
+
+  SILC_LOG_DEBUG(("Start"));
+
+  /* Save the client infos */
+  client_entry = silc_calloc(1, sizeof(*client_entry));
+  client_entry->id = id;
+  client_entry->valid = TRUE;
+  silc_parse_userfqdn(nickname, &nick, &client_entry->server);
+  silc_parse_userfqdn(username, &client_entry->username, 
+                     &client_entry->hostname);
+  if (userinfo)
+    client_entry->realname = strdup(userinfo);
+  client_entry->mode = mode;
+  if (nick)
+    client_entry->nickname = strdup(nick);
+
+  /* Format the nickname */
+  silc_client_nickname_format(client, conn, client_entry);
+  
+  /* Add client to cache, the non-formatted nickname is saved to cache */
+  if (!silc_idcache_add(conn->client_cache, nick, client_entry->id, 
+                       (void *)client_entry, 0, NULL)) {
+    silc_free(client_entry->nickname);
+    silc_free(client_entry->username);
+    silc_free(client_entry->hostname);
+    silc_free(client_entry->server);
+    silc_free(client_entry);
+    return NULL;
+  }
+
+  return client_entry;
+}
+
+/* Updates the `client_entry' with the new information sent as argument. */
+
+void silc_client_update_client(SilcClient client,
+                              SilcClientConnection conn,
+                              SilcClientEntry client_entry,
+                              const char *nickname,
+                              const char *username,
+                              const char *userinfo,
+                              uint32 mode)
+{
+  char *nick = NULL;
+
+  SILC_LOG_DEBUG(("Start"));
+
+  if (!client_entry->username && username)
+    silc_parse_userfqdn(username, &client_entry->username, 
+                       &client_entry->hostname);
+  if (!client_entry->realname && userinfo)
+    client_entry->realname = strdup(userinfo);
+  if (!client_entry->nickname && nickname) {
+    silc_parse_userfqdn(nickname, &nick, &client_entry->server);
+    client_entry->nickname = strdup(nick);
+    silc_client_nickname_format(client, conn, client_entry);
+  }
+  client_entry->mode = mode;
+
+  if (nick) {
+    /* Remove the old cache entry and create a new one */
+    silc_idcache_del_by_context(conn->client_cache, client_entry);
+    silc_idcache_add(conn->client_cache, nick, client_entry->id, 
+                    client_entry, 0, NULL);
+  }
+}
+
 /* Deletes the client entry and frees all memory. */
 
 void silc_client_del_client_entry(SilcClient client, 
+                                 SilcClientConnection conn,
                                  SilcClientEntry client_entry)
 {
+  SILC_LOG_DEBUG(("Start"));
+
   silc_free(client_entry->nickname);
   silc_free(client_entry->username);
   silc_free(client_entry->realname);
   silc_free(client_entry->server);
   silc_free(client_entry->id);
+  silc_free(client_entry->fingerprint);
   if (client_entry->send_key)
     silc_cipher_free(client_entry->send_key);
   if (client_entry->receive_key)
     silc_cipher_free(client_entry->receive_key);
   silc_free(client_entry->key);
+  silc_client_ftp_session_free_client(conn, client_entry);
+  if (client_entry->ke)
+    silc_client_abort_key_agreement(client, conn, client_entry);
   silc_free(client_entry);
 }
 
@@ -541,7 +700,7 @@ bool silc_client_del_client(SilcClient client, SilcClientConnection conn,
                            SilcClientEntry client_entry)
 {
   bool ret = silc_idcache_del_by_context(conn->client_cache, client_entry);
-  silc_client_del_client_entry(client, client_entry);
+  silc_client_del_client_entry(client, conn, client_entry);
   return ret;
 }
 
@@ -558,6 +717,12 @@ bool silc_client_del_channel(SilcClient client, SilcClientConnection conn,
     silc_cipher_free(channel->channel_key);
   if (channel->hmac)
     silc_hmac_free(channel->hmac);
+  if (channel->old_channel_key)
+    silc_cipher_free(channel->old_channel_key);
+  if (channel->old_hmac)
+    silc_hmac_free(channel->old_hmac);
+  if (channel->rekey_task)
+    silc_schedule_task_del(conn->client->schedule, channel->rekey_task);
   silc_client_del_channel_private_keys(client, conn, channel);
   silc_free(channel);
   return ret;
@@ -574,6 +739,8 @@ SilcChannelEntry silc_client_get_channel(SilcClient client,
   SilcIDCacheEntry id_cache;
   SilcChannelEntry entry;
 
+  SILC_LOG_DEBUG(("Start"));
+
   if (!silc_idcache_find_by_name_one(conn->channel_cache, channel, 
                                     &id_cache))
     return NULL;
@@ -594,6 +761,8 @@ SilcChannelEntry silc_client_get_channel_by_id(SilcClient client,
   SilcIDCacheEntry id_cache;
   SilcChannelEntry entry;
 
+  SILC_LOG_DEBUG(("Start"));
+
   if (!silc_idcache_find_by_id_one(conn->channel_cache, channel_id, 
                                   &id_cache))
     return NULL;
@@ -617,6 +786,8 @@ SILC_CLIENT_CMD_FUNC(get_channel_by_id_callback)
   GetChannelByIDInternal i = (GetChannelByIDInternal)context;
   SilcChannelEntry entry;
 
+  SILC_LOG_DEBUG(("Start"));
+
   /* Get the channel */
   entry = silc_client_get_channel_by_id(i->client, i->conn,
                                        i->channel_id);
@@ -648,11 +819,7 @@ void silc_client_get_channel_by_id_resolve(SilcClient client,
   SilcBuffer idp;
   GetChannelByIDInternal i = silc_calloc(1, sizeof(*i));
 
-  idp = silc_id_payload_encode(channel_id, SILC_ID_CHANNEL);
-  silc_client_send_command(client, conn, SILC_COMMAND_IDENTIFY, 
-                          ++conn->cmd_ident,
-                          1, 5, idp->data, idp->len);
-  silc_buffer_free(idp);
+  SILC_LOG_DEBUG(("Start"));
 
   i->client = client;
   i->conn = conn;
@@ -660,9 +827,20 @@ void silc_client_get_channel_by_id_resolve(SilcClient client,
   i->completion = completion;
   i->context = context;
       
+  /* Register our own command reply for this command */
+  silc_client_command_register(client, SILC_COMMAND_IDENTIFY, NULL, NULL,
+                              silc_client_command_reply_identify_i, 0,
+                              ++conn->cmd_ident);
+
+  /* Send the command */
+  idp = silc_id_payload_encode(channel_id, SILC_ID_CHANNEL);
+  silc_client_command_send(client, conn, SILC_COMMAND_IDENTIFY, 
+                          conn->cmd_ident,
+                          1, 5, idp->data, idp->len);
+  silc_buffer_free(idp);
+
   /* Add pending callback */
-  silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, 
-                             conn->cmd_ident, 
+  silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident,
                              silc_client_get_channel_by_id_destructor,
                              silc_client_command_get_channel_by_id_callback, 
                              (void *)i);
@@ -678,14 +856,22 @@ SilcChannelEntry silc_idlist_get_channel_by_id(SilcClient client,
   SilcBuffer idp;
   SilcChannelEntry channel;
 
+  SILC_LOG_DEBUG(("Start"));
+
   channel = silc_client_get_channel_by_id(client, conn, channel_id);
   if (channel)
     return channel;
 
   if (query) {
+    /* Register our own command reply for this command */
+    silc_client_command_register(client, SILC_COMMAND_IDENTIFY, NULL, NULL,
+                                silc_client_command_reply_identify_i, 0,
+                                ++conn->cmd_ident);
+
+    /* Send the command */
     idp = silc_id_payload_encode(channel_id, SILC_ID_CHANNEL);
-    silc_client_send_command(client, conn, SILC_COMMAND_IDENTIFY, 
-                            ++conn->cmd_ident,
+    silc_client_command_send(client, conn, SILC_COMMAND_IDENTIFY, 
+                            conn->cmd_ident,
                             1, 5, idp->data, idp->len);
     silc_buffer_free(idp);
   }
@@ -702,6 +888,8 @@ SilcServerEntry silc_client_get_server(SilcClient client,
   SilcIDCacheEntry id_cache;
   SilcServerEntry entry;
 
+  SILC_LOG_DEBUG(("Start"));
+
   if (!silc_idcache_find_by_name_one(conn->server_cache, server_name, 
                                     &id_cache))
     return NULL;
@@ -720,6 +908,8 @@ SilcServerEntry silc_client_get_server_by_id(SilcClient client,
   SilcIDCacheEntry id_cache;
   SilcServerEntry entry;
 
+  SILC_LOG_DEBUG(("Start"));
+
   if (!silc_idcache_find_by_id_one(conn->server_cache, (void *)server_id, 
                                   &id_cache))
     return NULL;
@@ -741,3 +931,141 @@ bool silc_client_del_server(SilcClient client, SilcClientConnection conn,
   silc_free(server);
   return ret;
 }
+
+/* Formats the nickname of the client specified by the `client_entry'.
+   If the format is specified by the application this will format the
+   nickname and replace the old nickname in the client entry. If the
+   format string is not specified then this function has no effect. */
+
+void silc_client_nickname_format(SilcClient client, 
+                                SilcClientConnection conn,
+                                SilcClientEntry client_entry)
+{
+  char *cp;
+  char *newnick = NULL;
+  int i, off = 0, len;
+  SilcClientEntry *clients;
+  uint32 clients_count = 0;
+
+  SILC_LOG_DEBUG(("Start"));
+
+  if (!client->internal->params->nickname_format[0])
+    return;
+
+  if (!client_entry->nickname)
+    return;
+
+  /* Get all clients with same nickname. Do not perform the formatting
+     if there aren't any clients with same nickname unless the application
+     is forcing us to do so. */
+  clients = silc_client_get_clients_local(client, conn,
+                                         client_entry->nickname, NULL,
+                                         &clients_count);
+  if (!clients && !client->internal->params->nickname_force_format)
+    return;
+
+  len = 0;
+  for (i = 0; i < clients_count; i++)
+    if (clients[i]->valid && clients[i] != client_entry)
+      len++;
+  if (!len)
+    return;
+
+  cp = client->internal->params->nickname_format;
+  while (*cp) {
+    if (*cp == '%') {
+      cp++;
+      continue;
+    }
+
+    switch(*cp) {
+    case 'n':
+      /* Nickname */
+      if (!client_entry->nickname)
+       break;
+      len = strlen(client_entry->nickname);
+      newnick = silc_realloc(newnick, sizeof(*newnick) * (off + len));
+      memcpy(&newnick[off], client_entry->nickname, len);
+      off += len;
+      break;
+    case 'h':
+      /* Stripped hostname */
+      if (!client_entry->hostname)
+       break;
+      len = strcspn(client_entry->hostname, ".");
+      newnick = silc_realloc(newnick, sizeof(*newnick) * (off + len));
+      memcpy(&newnick[off], client_entry->hostname, len);
+      off += len;
+      break;
+    case 'H':
+      /* Full hostname */
+      if (!client_entry->hostname)
+       break;
+      len = strlen(client_entry->hostname);
+      newnick = silc_realloc(newnick, sizeof(*newnick) * (off + len));
+      memcpy(&newnick[off], client_entry->hostname, len);
+      off += len;
+      break;
+    case 's':
+      /* Stripped server name */
+      if (!client_entry->server)
+       break;
+      len = strcspn(client_entry->server, ".");
+      newnick = silc_realloc(newnick, sizeof(*newnick) * (off + len));
+      memcpy(&newnick[off], client_entry->server, len);
+      off += len;
+      break;
+    case 'S':
+      /* Full server name */
+      if (!client_entry->server)
+       break;
+      len = strlen(client_entry->server);
+      newnick = silc_realloc(newnick, sizeof(*newnick) * (off + len));
+      memcpy(&newnick[off], client_entry->server, len);
+      off += len;
+      break;
+    case 'a':
+      /* Ascending number */
+      {
+       char tmp[6];
+       int num, max = 1;
+
+       if (clients_count == 1)
+         break;
+
+       for (i = 0; i < clients_count; i++) {
+         if (strncasecmp(clients[i]->nickname, newnick, off))
+           continue;
+         if (strlen(clients[i]->nickname) <= off)
+           continue;
+         num = atoi(&clients[i]->nickname[off]);
+         if (num > max)
+           max = num;
+       }
+       
+       memset(tmp, 0, sizeof(tmp));
+       snprintf(tmp, sizeof(tmp) - 1, "%d", ++max);
+       len = strlen(tmp);
+       newnick = silc_realloc(newnick, sizeof(*newnick) * (off + len));
+       memcpy(&newnick[off], tmp, len);
+       off += len;
+      }
+      break;
+    default:
+      /* Some other character in the string */
+      newnick = silc_realloc(newnick, sizeof(*newnick) * (off + 1));
+      memcpy(&newnick[off], cp, 1);
+      off++;
+      break;
+    }
+
+    cp++;
+  }
+
+  newnick = silc_realloc(newnick, sizeof(*newnick) * (off + 1));
+  newnick[off] = 0;
+
+  silc_free(client_entry->nickname);
+  client_entry->nickname = newnick;
+  silc_free(clients);
+}