Rewrote WHOIS, WHOWAS and IDENTIFY commands.
[silc.git] / apps / silcd / server_query.c
index 711ecdefa3a416849fd7fab621666cb32b091e68..f3696c37a47a78a54f8b3d27a4b267eaf7c0db5d 100644 (file)
 */
 /* $Id$ */
 
+/* XXX TODO Requested Attributes to WHOIS
+   (NOTE: entry that is incomplete must be resolved first before resolving
+   the attributes) */
+
 #include "serverincludes.h"
 #include "server_internal.h"
 
+typedef struct {
+  SilcSocketConnection sock;       /* Connection of this query */
+  unsigned char **arg;             /* Query argument */
+  SilcUInt32 *arg_lens;                    /* Query argument lengths */
+  SilcUInt32 *arg_types;           /* Query argument types */
+  SilcUInt32 argc;                 /* Number of query arguments */
+  SilcUInt32 timeout;              /* Max timeout for query to complete */
+  SilcUInt16 ident;                /* Query command identifier */
+} *SilcServerQueryList;
+
 /* Represents an SILC ID */
 typedef struct {
   void *id;                        /* ID */
   SilcIdType id_type;              /* ID type */
+  SilcUInt16 ident;                /* Command identifier */
 } *SilcServerQueryID;
 
 /* Represents one error occurred during query */
 typedef struct {
-  SilcUInt32 index;                /* Index to IDs */
-  bool from_cmd;                   /* TRUE if `index' is from command args,
+  void *id;                        /* ID */
+  SilcUInt16 index;                /* Index to IDs */
+  SilcIdType id_type;              /* ID type */
+  unsigned int from_cmd : 1;               /* TRUE if `index' is from command args,
                                       otherwise from query->ids */
-  SilcStatus error;                /* The actual error */
+  unsigned int error : 7;          /* The actual error (SilcStatus) */
 } *SilcServerQueryError;
 
-/* Context for ongoing queries that server the original query (like to
-   resolve detailed information from some other server before replying
-   to the original sender). */
-typedef struct {
-  unsigned char **arg;             /* Query argument */
-  SilcUInt32 *arg_lens;                    /* Query argument lengths */
-  SilcUInt32 *arg_types;           /* Query argument types */
-  SilcUInt32 argc;                 /* Number of query arguments */
-  SilcUInt32 timeout;              /* Max timeout for query to complete */
-  SilcUInt16 ident;                /* Query command identifier */
-} *SilcServerQueryList;
-
 /* Query session context */
 typedef struct {
-  /* Query session data */
-  SilcCommand querycmd;                    /* Query command */
-  SilcServerCommandContext cmd;            /* Command context for query */
-  SilcServerQueryList queries;     /* Ongoing queries */
-  SilcUInt32 num_query;                    /* Number of ongoing queries left */
-
   /* Queried data */
   char *nickname;                  /* Queried nickname */
   char *nick_server;               /* Queried nickname's server */
@@ -65,14 +64,21 @@ typedef struct {
   SilcUInt32 reply_count;          /* Requested reply count */
   SilcDList attrs;                 /* Requested Attributes in WHOIS */
 
+  /* Query session data */
+  SilcServerCommandContext cmd;            /* Command context for query */
+  SilcServerQueryList querylist;    /* Temporary query list context */
+  SilcServerQueryID queries;       /* Ongoing queries */
   SilcServerQueryError errors;     /* Query errors */
-  SilcUInt32 errors_count;         /* number of errors */
+  SilcUInt16 querylist_count;      /* Number of query lists */
+  SilcUInt16 queries_count;        /* Number of ongoing queries */
+  SilcUInt16 queries_left;         /* Number of ongoing queries left */
+  SilcUInt16 errors_count;         /* number of errors */
+  unsigned int querycmd : 7;       /* Query command (SilcCommand) */
+  unsigned int resolved : 1;       /* TRUE if normal server has resolved
+                                      information from router */
 } *SilcServerQuery;
 
 void silc_server_query_free(SilcServerQuery query);
-bool silc_server_query_check_error(SilcServer server,
-                                  SilcServerQuery query,
-                                  SilcServerCommandReplyContext cmdr);
 void silc_server_query_send_error(SilcServer server,
                                  SilcServerQuery query,
                                  SilcStatus error, ...);
@@ -81,10 +87,15 @@ void silc_server_query_add_error(SilcServer server,
                                 bool from_cmd,
                                 SilcUInt32 index,
                                 SilcStatus error);
+void silc_server_query_add_error_id(SilcServer server,
+                                   SilcServerQuery query,
+                                   SilcStatus error,
+                                   void *id, SilcIdType id_type);
 void silc_server_query_send_router(SilcServer server, SilcServerQuery query);
 void silc_server_query_send_router_reply(void *context, void *reply);
 void silc_server_query_parse(SilcServer server, SilcServerQuery query);
-void silc_server_query_process(SilcServer server, SilcServerQuery query);
+void silc_server_query_process(SilcServer server, SilcServerQuery query,
+                              bool resolve);
 void silc_server_query_resolve(SilcServer server, SilcServerQuery query,
                               SilcSocketConnection sock,
                               SilcClientEntry client_entry);
@@ -106,6 +117,10 @@ void silc_server_query_free(SilcServerQuery query)
 
   silc_server_command_free(query->cmd);
 
+  for (i = 0; i < query->queries_count; i++)
+    silc_free(query->queries[i].id);
+  silc_free(query->queries);
+
   silc_free(query->nickname);
   silc_free(query->nick_server);
   silc_free(query->server_name);
@@ -118,40 +133,14 @@ void silc_server_query_free(SilcServerQuery query)
   if (query->attrs)
     silc_attribute_payload_list_free(query->attrs);
 
+  for (i = 0; i < query->errors_count; i++)
+    silc_free(query->errors[i].id);
   silc_free(query->errors);
 
   memset(query, 'F', sizeof(*query));
   silc_free(query);
 }
 
-/* Check whether command reply contained error, and reply the error to
-   the original sender if it occurred. */
-
-bool silc_server_query_check_error(SilcServer server,
-                                  SilcServerQuery query,
-                                  SilcServerCommandReplyContext cmdr)
-{
-  if (!cmdr)
-    return FALSE;
-
-  if (!silc_command_get_status(cmdr->payload, NULL, NULL)) {
-    SilcBuffer buffer;
-
-    /* Send the same command reply payload which contains the error */
-    silc_command_set_command(cmdr->payload, query->querycmd);
-    silc_command_set_ident(cmdr->payload,
-                          silc_command_get_ident(query->cmd->payload));
-    buffer = silc_command_payload_encode_payload(cmdr->payload);
-    silc_server_packet_send(server, query->cmd->sock,
-                           SILC_PACKET_COMMAND_REPLY, 0, 
-                           buffer->data, buffer->len, FALSE);
-    silc_buffer_free(buffer);
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
 /* Send error reply indicated by the `error' to the original sender of
    the query. */
 
@@ -171,6 +160,8 @@ void silc_server_query_send_error(SilcServer server,
     data_len = va_arg(va, SilcUInt32);
   }
 
+  SILC_LOG_DEBUG(("ERROR: %s (%d)", silc_get_status_message(error), error));
+
   /* Send the command reply with error */
   silc_server_send_command_reply(server, query->cmd->sock,
                                 query->querycmd, error, 0, 
@@ -198,6 +189,28 @@ void silc_server_query_add_error(SilcServer server,
   query->errors[query->errors_count].index = index;
   query->errors[query->errors_count].from_cmd = from_cmd;
   query->errors[query->errors_count].error = error;
+  query->errors[query->errors_count].id = NULL;
+  query->errors[query->errors_count].id_type = 0;
+  query->errors_count++;
+}
+
+/* Same as silc_server_query_add_error but adds the ID data to be used
+   with error sending with this error type. */
+
+void silc_server_query_add_error_id(SilcServer server,
+                                   SilcServerQuery query,
+                                   SilcStatus error,
+                                   void *id, SilcIdType id_type)
+{
+  query->errors = silc_realloc(query->errors, sizeof(*query->errors) *
+                              (query->errors_count + 1));
+  if (!query->errors)
+    return;
+  query->errors[query->errors_count].index = 0;
+  query->errors[query->errors_count].from_cmd = FALSE;
+  query->errors[query->errors_count].error = error;
+  query->errors[query->errors_count].id = silc_id_dup(id, id_type);
+  query->errors[query->errors_count].id_type = id_type;
   query->errors_count++;
 }
 
@@ -213,6 +226,8 @@ bool silc_server_query_command(SilcServer server, SilcCommand querycmd,
 {
   SilcServerQuery query;
 
+  SILC_LOG_DEBUG(("Query %s command", silc_get_command_name(querycmd)));
+
   query = silc_calloc(1, sizeof(*query));
   query->querycmd = querycmd;
   query->cmd = silc_server_command_dup(cmd);
@@ -223,17 +238,19 @@ bool silc_server_query_command(SilcServer server, SilcCommand querycmd,
     /* If we are normal server and query contains nickname, send it
        directly to router. */
     if (server->server_type == SILC_SERVER && !server->standalone &&
+       cmd->sock != SILC_PRIMARY_ROUTE(server) &&
        silc_argument_get_arg_type(cmd->args, 1, NULL)) {
       silc_server_query_send_router(server, query);
-      break;
+      return TRUE;
     }
     break;
 
   case SILC_COMMAND_WHOWAS:
     /* WHOWAS query is always sent to router if we are normal server */
-    if (server->server_type == SILC_SERVER && !server->standalone) {
+    if (server->server_type == SILC_SERVER && !server->standalone &&
+       cmd->sock != SILC_PRIMARY_ROUTE(server)) {
       silc_server_query_send_router(server, query);
-      break;
+      return TRUE;
     }
     break;
 
@@ -242,9 +259,10 @@ bool silc_server_query_command(SilcServer server, SilcCommand querycmd,
        directly to router (it contains nickname, server name or channel
        name). */
     if (server->server_type == SILC_SERVER && !server->standalone &&
+       cmd->sock != SILC_PRIMARY_ROUTE(server) &&
        !silc_argument_get_arg_type(cmd->args, 5, NULL)) {
       silc_server_query_send_router(server, query);
-      break;
+      return TRUE;
     }
     break;
 
@@ -269,6 +287,8 @@ void silc_server_query_send_router(SilcServer server, SilcServerQuery query)
   SilcBuffer tmpbuf;
   SilcUInt16 old_ident;
 
+  SILC_LOG_DEBUG(("Forwarding the query to router for processing"));
+
   /* Send WHOIS command to our router */
   old_ident = silc_command_get_ident(query->cmd->payload);
   silc_command_set_ident(query->cmd->payload, ++server->cmd_ident);
@@ -280,6 +300,8 @@ void silc_server_query_send_router(SilcServer server, SilcServerQuery query)
   silc_command_set_ident(query->cmd->payload, old_ident);
   silc_buffer_free(tmpbuf);
 
+  query->resolved = TRUE;
+
   /* Continue parsing the query after received reply from router */
   silc_server_command_pending(server, query->querycmd, server->cmd_ident,
                              silc_server_query_send_router_reply, query);
@@ -292,9 +314,25 @@ void silc_server_query_send_router_reply(void *context, void *reply)
 {
   SilcServerQuery query = context;
   SilcServer server = query->cmd->server;
+  SilcServerCommandReplyContext cmdr = reply;
+
+  SILC_LOG_DEBUG(("Received reply from router to query"));
 
   /* Check if router sent error reply */
-  if (!silc_server_query_check_error(server, query, reply)) {
+  if (cmdr && !silc_command_get_status(cmdr->payload, NULL, NULL)) {
+    SilcBuffer buffer;
+
+    SILC_LOG_DEBUG(("Sending error to original query"));
+
+    /* Send the same command reply payload which contains the error */
+    silc_command_set_command(cmdr->payload, query->querycmd);
+    silc_command_set_ident(cmdr->payload,
+                          silc_command_get_ident(query->cmd->payload));
+    buffer = silc_command_payload_encode_payload(cmdr->payload);
+    silc_server_packet_send(server, query->cmd->sock,
+                           SILC_PACKET_COMMAND_REPLY, 0, 
+                           buffer->data, buffer->len, FALSE);
+    silc_buffer_free(buffer);
     silc_server_query_free(query);
     return;
   }
@@ -314,6 +352,9 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query)
   SilcIdType id_type;
   int i;
 
+  SILC_LOG_DEBUG(("Parsing %s query",
+                 silc_get_command_name(query->querycmd)));
+
   switch (query->querycmd) {
 
   case SILC_COMMAND_WHOIS:
@@ -354,6 +395,23 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query)
          continue;
        }
 
+       /* Normal server must check whether this ID exist, and if not then
+          send the query to router, unless done so already */
+       if (server->server_type == SILC_SERVER && !query->resolved) {
+         if (!silc_idlist_find_client_by_id(server->local_list,
+                                            id, TRUE, NULL)) {
+           if (cmd->sock->type != SILC_SOCKET_TYPE_CLIENT ||
+               !silc_idlist_find_client_by_id(server->global_list,
+                                              id, TRUE, NULL)) {
+             silc_server_query_send_router(server, query);
+             for (i = 0; i < query->ids_count; i++)
+               silc_free(query->ids[i].id);
+             silc_free(query->ids);
+             return;
+           }
+         }
+       }
+
        query->ids[query->ids_count].id = id;
        query->ids[query->ids_count].id_type = SILC_ID_CLIENT;
        query->ids_count++;
@@ -435,6 +493,23 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query)
          continue;
        }
 
+       /* Normal server must check whether this ID exist, and if not then
+          send the query to router, unless done so already */
+       if (server->server_type == SILC_SERVER && !query->resolved) {
+         if (!silc_idlist_find_client_by_id(server->local_list,
+                                            id, TRUE, NULL)) {
+           if (cmd->sock->type != SILC_SOCKET_TYPE_CLIENT ||
+               !silc_idlist_find_client_by_id(server->global_list,
+                                              id, TRUE, NULL)) {
+             silc_server_query_send_router(server, query);
+             for (i = 0; i < query->ids_count; i++)
+               silc_free(query->ids[i].id);
+             silc_free(query->ids);
+             return;
+           }
+         }
+       }
+
        query->ids[query->ids_count].id = id;
        query->ids[query->ids_count].id_type = id_type;
        query->ids_count++;
@@ -449,15 +524,15 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query)
   }
 
   /* Start processing the query information */
-  silc_server_query_process(server, query);
+  silc_server_query_process(server, query, TRUE);
 }
 
 /* Processes the parsed query.  This does the actual finding of the
    queried information and prepares for sending reply to the original
-   sender of the query command.  It is guaranteed that this function
-   (which may be slow) is called only once for entire query. */
+   sender of the query command. */
 
-void silc_server_query_process(SilcServer server, SilcServerQuery query)
+void silc_server_query_process(SilcServer server, SilcServerQuery query,
+                              bool resolve)
 {
   SilcServerCommandContext cmd = query->cmd;
   bool check_global = FALSE;
@@ -468,6 +543,9 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query)
   SilcUInt32 clients_count = 0, channels_count = 0, servers_count = 0;
   int i;
 
+  SILC_LOG_DEBUG(("Processing %s query",
+                 silc_get_command_name(query->querycmd)));
+
   /* Check global lists if query is coming from client or we are not
      normal server (we know global information). */
   if (cmd->sock->type == SILC_SOCKET_TYPE_CLIENT)
@@ -607,29 +685,40 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query)
   /* If nothing was found, then just send the errors */
   if (!clients && !channels && !servers) {
     silc_server_query_send_reply(server, query, NULL, 0, NULL, 0, NULL, 0);
-    silc_server_query_free(query);
+    return;
+  }
+
+  /* If caller does not want us to resolve anything (has resolved already)
+     then just continue with sending the reply */
+  if (!resolve) {
+    silc_server_query_send_reply(server, query, clients, clients_count,
+                                servers, servers_count, channels,
+                                channels_count);
+    silc_free(clients);
+    silc_free(servers);
+    silc_free(channels);
     return;
   }
 
   /* Now process all found information and if necessary do some more
-     querying. */
+     resolving. */
   switch (query->querycmd) {
 
   case SILC_COMMAND_WHOIS:
     for (i = 0; i < clients_count; i++) {
       client_entry = clients[i];
 
-      if (!client_entry)
+      /* Check if cannot query this anyway, so take next one */
+      if (!client_entry ||
+         !(client_entry->data.status & SILC_IDLIST_STATUS_REGISTERED))
        continue;
 
       /* If requested attributes is set then we always resolve the client
         information, if not then check whether the entry is complete or not
         and decide whether we need to resolve or not. */
       if (!query->attrs) {
-       if ((client_entry->nickname && client_entry->username &&
-            client_entry->userinfo) ||
-           !(client_entry->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
-
+       if (client_entry->nickname && client_entry->username &&
+           client_entry->userinfo) {
          /* Check if cannot query this anyway, so take next one */
          if (!client_entry->router)
            continue;
@@ -637,7 +726,8 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query)
          /* If we are router, client is local to us, or client is on channel
             we do not need to resolve the client information. */
          if (server->server_type != SILC_SERVER || SILC_IS_LOCAL(client_entry)
-             || silc_hash_table_count(client_entry->channels))
+             || silc_hash_table_count(client_entry->channels) ||
+             query->resolved)
            continue;
        }
       }
@@ -646,7 +736,8 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query)
         we cannot send the command to the client, we'll reply on behalf of
         the client instead. */
       if (query->attrs && SILC_IS_LOCAL(client_entry) &&
-         client_entry->mode & SILC_UMODE_DETACHED)
+         (client_entry->mode & SILC_UMODE_DETACHED ||
+          client_entry->data.status & SILC_IDLIST_STATUS_NOATTR))
        continue;
 
       /* Resolve the detailed client information. If client is local we
@@ -665,7 +756,8 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query)
       client_entry = clients[i];
 
       /* Check if cannot query this anyway, so take next one */
-      if (!client_entry || !client_entry->router)
+      if (!client_entry || !client_entry->router ||
+         client_entry->data.status & SILC_IDLIST_STATUS_REGISTERED)
        continue;
 
       /* If both nickname and username are present no resolving is needed */
@@ -684,15 +776,16 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query)
       client_entry = clients[i];
 
       /* Check if cannot query this anyway, so take next one */
-      if (!client_entry || !client_entry->router)
+      if (!client_entry || !client_entry->router ||
+         !(client_entry->data.status & SILC_IDLIST_STATUS_REGISTERED))
        continue;
 
-      if (client_entry->nickname ||
-         !(client_entry->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
+      if (client_entry->nickname) {
        /* If we are router, client is local to us, or client is on channel
           we do not need to resolve the client information. */
        if (server->server_type != SILC_SERVER || SILC_IS_LOCAL(client_entry)
-           || silc_hash_table_count(client_entry->channels))
+           || silc_hash_table_count(client_entry->channels) ||
+           query->resolved)
          continue;
       }
 
@@ -704,7 +797,7 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query)
     break;
   }
 
-  if (!query->num_query)
+  if (!query->queries_count)
     /* If we didn't have to do any resolving, continue with sending the
        command reply to the original sender. */
     silc_server_query_send_reply(server, query, clients, clients_count,
@@ -727,8 +820,13 @@ void silc_server_query_resolve(SilcServer server, SilcServerQuery query,
                               SilcSocketConnection sock,
                               SilcClientEntry client_entry)
 {
-#if 0
+  SilcServerCommandContext cmd = query->cmd;
+  SilcServerQueryList r = NULL;
+  SilcBuffer idp;
+  unsigned char *tmp;
+  SilcUInt32 len;
   SilcUInt16 ident;
+  int i;
 
   if (!sock && client_entry)
     return;
@@ -736,23 +834,115 @@ void silc_server_query_resolve(SilcServer server, SilcServerQuery query,
   /* If arguments are NULL we will now actually send the resolvings
      that earlier has been gathered by calling this function. */
   if (!sock && !client_entry) {
+    SilcBuffer res_cmd;
+
+    SILC_LOG_DEBUG(("Sending the resolvings"));
+
+    /* WHOWAS resolving has been done at the same time this function
+       was called to add the resolving for WHOWAS, so just return. */
+    if (query->querycmd == SILC_COMMAND_WHOWAS)
+      return;
+
+    for (i = 0; i < query->querylist_count; i++) {
+      r = &query->querylist[i];
+
+      /* Send WHOIS command */
+      res_cmd = silc_command_payload_encode(SILC_COMMAND_WHOIS,
+                                           r->argc, r->arg, r->arg_lens,
+                                           r->arg_types, r->ident);
+      silc_server_packet_send(server, r->sock, SILC_PACKET_COMMAND, 0,
+                             res_cmd->data, res_cmd->len, FALSE);
+      silc_buffer_free(res_cmd);
+
+      /* Reprocess this packet after received reply */
+      if (silc_server_command_pending_timed(server, SILC_COMMAND_WHOIS,
+                                           r->ident,
+                                           silc_server_query_resolve_reply,
+                                           query, r->timeout))
+       query->queries_left++;
+    }
 
+    /* Cleanup this temporary context */
+    for (i = 0; i < query->querylist_count; i++) {
+      int k;
+      for (k = 0; k < query->querylist[i].argc; k++)
+       silc_free(query->querylist[i].arg[k]);
+      silc_free(query->querylist[i].arg);
+      silc_free(query->querylist[i].arg_lens);
+      silc_free(query->querylist[i].arg_types);
+    }
+    silc_free(query->querylist);
+    query->querylist = NULL;
+    query->querylist_count = 0;
     return;
   }
 
+  SILC_LOG_DEBUG(("Resolving client information"));
+
   if (client_entry->data.status & SILC_IDLIST_STATUS_RESOLVING) {
     /* The entry is being resolved by some other external query already.
        Attach to that query instead of resolving again. */
     ident = client_entry->resolve_cmd_ident;
-    silc_server_command_pending(server, SILC_COMMAND_NONE, ident,
-                               silc_server_query_resolve_reply, query);
+    if (silc_server_command_pending(server, SILC_COMMAND_NONE, ident,
+                                   silc_server_query_resolve_reply, query))
+      query->queries_left++;
   } else {
+    /* This entry will be resolved */
     ident = ++server->cmd_ident;
 
     switch (query->querycmd) {
 
     case SILC_COMMAND_WHOIS:
     case SILC_COMMAND_IDENTIFY:
+      /* Take existing query context if exist for this connection */
+      for (i = 0; i < query->queries_count; i++)
+       if (query->querylist[i].sock == sock) {
+         r = &query->querylist[i];
+         break;
+       }
+
+      if (!r) {
+       /* Allocate new temp query list context */
+       query->querylist = silc_realloc(query->querylist,
+                                       sizeof(*query->querylist) * 
+                                       (query->querylist_count + 1));
+       r = &query->querylist[query->querylist_count];
+       query->querylist_count++;
+       memset(r, 0, sizeof(*r));
+       r->sock = sock;
+       r->ident = ident;
+       if (SILC_IS_LOCAL(client_entry))
+         r->timeout = 3;
+      }
+
+      /* If attributes were present put them to this resolving */
+      if (query->attrs && query->querycmd == SILC_COMMAND_WHOIS) {
+       len = r->argc + 1;
+       r->arg = silc_realloc(r->arg, sizeof(*r->arg) * len);
+       r->arg_lens = silc_realloc(r->arg_lens, sizeof(*r->arg_lens) * len);
+       r->arg_types = silc_realloc(r->arg_types, sizeof(*r->arg_types) * len);
+
+       tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
+       if (tmp)
+         r->arg[r->argc] = silc_memdup(tmp, len);
+       r->arg_lens[r->argc] = len;
+       r->arg_types[r->argc] = 3;
+       r->argc++;
+      }
+
+      len = r->argc + 1;
+      r->arg = silc_realloc(r->arg, sizeof(*r->arg) * len);
+      r->arg_lens = silc_realloc(r->arg_lens, sizeof(*r->arg_lens) * len);
+      r->arg_types = silc_realloc(r->arg_types, sizeof(*r->arg_types) * len);
+
+      /* Add the client entry to be resolved */
+      idp = silc_id_payload_encode(client_entry->id, SILC_ID_CLIENT);
+      r->arg[r->argc] = silc_memdup(idp->data, idp->len);
+      r->arg_lens[r->argc] = idp->len;
+      r->arg_types[r->argc] = r->argc + 4;
+      r->argc++;
+      silc_buffer_free(idp);
+
       break;
 
     case SILC_COMMAND_WHOWAS:
@@ -760,30 +950,29 @@ void silc_server_query_resolve(SilcServer server, SilcServerQuery query,
         resolving clients that are not present in the network anymore. */
       silc_server_send_command(server, sock, query->querycmd, ident, 1,
                               1, query->nickname, strlen(query->nickname));
+      if (silc_server_command_pending(server, query->querycmd, ident,
+                                     silc_server_query_resolve_reply, query))
+       query->queries_left++;
       break;
     }
-
-    silc_server_command_pending(server, query->querycmd, ident,
-                               silc_server_query_resolve_reply, query);
   }
 
   /* Mark the entry as being resolved */
   client_entry->data.status |= SILC_IDLIST_STATUS_RESOLVING;
   client_entry->data.status &= ~SILC_IDLIST_STATUS_RESOLVED;
-  client_entry->resovle_cmd_ident = ident;
-
-  /* Save the query information, which we will reprocess after we
-     get this and all other queries back. */
-  query->ids = silc_realloc(query->ids, sizeof(*query->ids) *
-                           (query->ids_count + 1));
-  if (query->ids) {
-    query->ids[query->ids_count].id = silc_id_dup(id, id_type);
-    query->ids[query->ids_count].id_type = id_type;
-    query->ids[query->ids_count].ident = ident;
-    query->ids_count++;
+  client_entry->resolve_cmd_ident = ident;
+
+  /* Save the queried ID, which we will reprocess after we get this and
+     all other queries back. */
+  query->queries = silc_realloc(query->queries, sizeof(*query->queries) *
+                               (query->queries_count + 1));
+  if (query->queries) {
+    i = query->queries_count;
+    query->queries[i].id = silc_id_dup(client_entry->id, SILC_ID_CLIENT);
+    query->queries[i].id_type = SILC_ID_CLIENT;
+    query->queries[i].ident = ident;
+    query->queries_count++;
   }
-  query->num_query++;
-#endif
 }
 
 /* Reply callback called after one resolving has been completed.  If
@@ -793,10 +982,74 @@ void silc_server_query_resolve(SilcServer server, SilcServerQuery query,
 void silc_server_query_resolve_reply(void *context, void *reply)
 {
   SilcServerQuery query = context;
+  SilcServer server = query->cmd->server;
+  SilcServerCommandReplyContext cmdr = reply;
+  SilcUInt16 ident = cmdr->ident;
+  SilcStatus error = SILC_STATUS_OK;
+  SilcServerQueryID id = NULL;
+  SilcClientEntry client_entry;
+  int i;
 
+  /* One less query left */
+  query->queries_left--;
+
+  silc_command_get_status(cmdr->payload, NULL, &error);
+  SILC_LOG_DEBUG(("Received reply to resolving (%d left) (status=%d)",
+                 query->queries_left, error));
+
+  /* If no error then skip to other stuff */
+  if (error == SILC_STATUS_OK)
+    goto out;
+
+  /* Error occurred during resolving */
+
+  /* Find the resolved client ID */
+  for (i = 0; i < query->queries_count; i++) {
+    if (query->queries[i].ident != ident)
+      continue;
+
+    id = &query->queries[i];
+
+    if (error == SILC_STATUS_ERR_TIMEDOUT) {
+      /* If timeout occurred for local entry when resolving attributes
+        mark that this client doesn't support attributes in WHOIS. This
+        assures we won't send the request again to the client. */
+      if (query->querycmd == SILC_COMMAND_WHOIS && query->attrs) {
+       client_entry = silc_idlist_find_client_by_id(server->local_list,
+                                                    id->id, TRUE, NULL);
+       SILC_LOG_DEBUG(("Client %s does not support Requested Attributes",
+                       silc_id_render(id->id, SILC_ID_CLIENT)));
+       if (client_entry && SILC_IS_LOCAL(client_entry))
+         client_entry->data.status |= SILC_IDLIST_STATUS_NOATTR;
+      }
+    }
+  }
+
+ out:
+
+  /* If there are queries left then wait for them */
+  if (query->queries_left)
+    return;
 
+  SILC_LOG_DEBUG(("Reprocess the query"));
+
+  /* We have received all queries.  Now re-search all information required
+     to complete this query.  Reason we cannot save the values found in
+     the first search is that SilcClientEntry, SilcServerEntry and
+     SilcChannelEntry pointers may become invalid while we were waiting
+     for these resolvings. */
+  silc_server_query_process(server, query, FALSE);
 }
 
+/* Send the reply to the original query.  If arguments are NULL then this
+   sends only the errors that has occurred during the processing of the
+   query.  This sends the errors always after sending all the found
+   information.  The query is over after this function returns and the
+   `query' will become invalid.  This is called only after all informations
+   has been resolved.  This means that if something is not found or is
+   incomplete in this function we were unable to resolve the information
+   or it does not exist at all. */
+
 void silc_server_query_send_reply(SilcServer server,
                                  SilcServerQuery query,
                                  SilcClientEntry *clients,
@@ -806,7 +1059,385 @@ void silc_server_query_send_reply(SilcServer server,
                                  SilcChannelEntry *channels,
                                  SilcUInt32 channels_count)
 {
+  SilcServerCommandContext cmd = query->cmd;
+  SilcUInt16 ident = silc_command_get_ident(cmd->payload);
+  SilcStatus status;
+  unsigned char *tmp;
+  SilcUInt32 len;
+  SilcBuffer idp;
+  int i, k, valid_count;
+  char nh[256], uh[256];
+
+  SILC_LOG_DEBUG(("Sending reply to query"));
+
+  status = SILC_STATUS_OK;
+
+  /* Send clients */
+  if (clients_count) {
+    SilcClientEntry entry;
+    SilcSocketConnection hsock;
+
+    /* Mark all invalid entries */
+    for (i = 0, valid_count = 0; i < clients_count; i++) {
+      entry = clients[i];
+      switch (query->querycmd) {
+      case SILC_COMMAND_WHOIS:
+       if (!entry->nickname || !entry->username || !entry->userinfo ||
+           !(entry->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
+         /* When querying by ID, every "unfound" entry must cause error */
+         if (query->ids)
+           silc_server_query_add_error_id(server, query,
+                                          SILC_STATUS_ERR_TIMEDOUT,
+                                          entry->id, SILC_ID_CLIENT);
+         clients[i] = NULL;
+         continue;
+       }
+       break;
+
+      case SILC_COMMAND_IDENTIFY:
+       if (!entry->nickname ||
+           !(entry->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
+         /* When querying by ID, every "unfound" entry must cause error */
+         if (query->ids)
+           silc_server_query_add_error_id(server, query,
+                                          SILC_STATUS_ERR_TIMEDOUT,
+                                          entry->id, SILC_ID_CLIENT);
+         clients[i] = NULL;
+         continue;
+       }
+       break;
+
+      case SILC_COMMAND_WHOWAS:
+       if (!entry->nickname || !entry->username ||
+           entry->data.status & SILC_IDLIST_STATUS_REGISTERED) {
+         clients[i] = NULL;
+         continue;
+       }
+       break;
+      }
+      valid_count++;
+    }
+
+    /* Start processing found clients */
+    status = SILC_STATUS_OK;
+    if (valid_count > 1)
+      status = SILC_STATUS_LIST_START;
+
+    /* Now do the sending of valid entries */
+    k = 0;
+    for (i = 0; i < clients_count && valid_count; i++) {
+      entry = clients[i];
+      if (!entry)
+       continue;
+
+      if (k >= 1)
+       status = SILC_STATUS_LIST_ITEM;
+      if (valid_count > 1 && k == valid_count - 1 
+         && !servers_count && !channels_count && !query->errors_count)
+       status = SILC_STATUS_LIST_END;
+      if (query->reply_count && k - 1 == query->reply_count)
+       status = SILC_STATUS_LIST_END;
+
+      SILC_LOG_DEBUG(("%s: client %s",
+                     (status == SILC_STATUS_OK ?         "   OK" :
+                      status == SILC_STATUS_LIST_START ? "START" :
+                      status == SILC_STATUS_LIST_ITEM  ? " ITEM" :
+                      status == SILC_STATUS_LIST_END  ?  "  END" :
+                      "      : "), entry->nickname));
+
+      idp = silc_id_payload_encode(entry->id, SILC_ID_CLIENT);
+      memset(uh, 0, sizeof(uh));
+      memset(nh, 0, sizeof(nh));
+
+      silc_strncat(nh, sizeof(nh), entry->nickname, strlen(entry->nickname));
+      if (!strchr(entry->nickname, '@')) {
+       silc_strncat(nh, sizeof(nh), "@", 1);
+       if (entry->servername) {
+         silc_strncat(nh, sizeof(nh), entry->servername,
+                      strlen(entry->servername));
+       } else {
+         len = entry->router ? strlen(entry->router->server_name) :
+           strlen(server->server_name);
+         silc_strncat(nh, sizeof(nh), entry->router ?
+                      entry->router->server_name :
+                      server->server_name, len);
+       }
+      }
+      
+      switch (query->querycmd) {
+       
+      case SILC_COMMAND_WHOIS:
+       {
+         unsigned char idle[4], mode[4];
+         unsigned char *fingerprint, fempty[20];
+         SilcBuffer channels, umode_list = NULL;
+
+         memset(fempty, 0, sizeof(fempty));
+         silc_strncat(uh, sizeof(uh), entry->username,
+                      strlen(entry->username));
+         if (!strchr(entry->username, '@') && entry->connection) {
+           hsock = entry->connection;
+           silc_strncat(uh, sizeof(uh), "@", 1);
+           len = strlen(hsock->hostname);
+           silc_strncat(uh, sizeof(uh), hsock->hostname, len);
+         }
+
+         if (cmd->sock->type == SILC_SOCKET_TYPE_CLIENT)
+           channels =
+             silc_server_get_client_channel_list(server, entry, FALSE, 
+                                                 FALSE, &umode_list);
+         else
+           channels =
+             silc_server_get_client_channel_list(server, entry, TRUE, 
+                                                 TRUE, &umode_list);
+
+         if (memcmp(entry->data.fingerprint, fempty, sizeof(fempty)))
+           fingerprint = entry->data.fingerprint;
+         else
+           fingerprint = NULL;
+
+         SILC_PUT32_MSB(entry->mode, mode);
+         if (entry->connection)
+           SILC_PUT32_MSB((time(NULL) - entry->data.last_receive), idle);
+
+         /* Send command reply */
+         silc_server_send_command_reply(server, cmd->sock, query->querycmd,
+                                        status, 0, ident, 9,
+                                        2, idp->data, idp->len,
+                                        3, nh, strlen(nh),
+                                        4, uh, strlen(uh),
+                                        5, entry->userinfo, 
+                                        strlen(entry->userinfo),
+                                        6, channels ? channels->data : NULL,
+                                        channels ? channels->len : 0,
+                                        7, mode, 4,
+                                        8, idle, 4,
+                                        9, fingerprint,
+                                        fingerprint ? 20 : 0,
+                                        10, umode_list ? umode_list->data :
+                                        NULL, umode_list ? umode_list->len :
+                                        0);
+
+         if (channels)
+           silc_buffer_free(channels);
+         if (umode_list) {
+           silc_buffer_free(umode_list);
+           umode_list = NULL;
+         }
+       }
+       break;
+
+      case SILC_COMMAND_IDENTIFY:
+       if (!entry->username) {
+         silc_server_send_command_reply(server, cmd->sock, query->querycmd,
+                                        status, 0, ident, 2,
+                                        2, idp->data, idp->len,
+                                        3, nh, strlen(nh));
+       } else {
+         silc_strncat(uh, sizeof(uh), entry->username,
+                      strlen(entry->username));
+         if (!strchr(entry->username, '@') && entry->connection) {
+           hsock = entry->connection;
+           silc_strncat(uh, sizeof(uh), "@", 1);
+           len = strlen(hsock->hostname);
+           silc_strncat(uh, sizeof(uh), hsock->hostname, len);
+         }
+
+         silc_server_send_command_reply(server, cmd->sock, query->querycmd,
+                                        status, 0, ident, 3,
+                                        2, idp->data, idp->len,
+                                        3, nh, strlen(nh),
+                                        4, uh, strlen(uh));
+       }
+       break;
+
+      case SILC_COMMAND_WHOWAS:
+       silc_strncat(uh, sizeof(uh), entry->username, strlen(entry->username));
+       if (!strchr(entry->username, '@'))
+         silc_strncat(uh, sizeof(uh), "@*private*", 10);
+
+       /* Send command reply */
+       silc_server_send_command_reply(server, cmd->sock, query->querycmd,
+                                      status, 0, ident, 4,
+                                      2, idp->data, idp->len,
+                                      3, nh, strlen(nh),
+                                      4, uh, strlen(uh),
+                                      5, entry->userinfo, 
+                                      entry->userinfo ? 
+                                      strlen(entry->userinfo) : 0);
+       break;
+      }
+
+      silc_buffer_free(idp);
 
+      if (status == SILC_STATUS_LIST_END)
+       break;
+      k++;
+    }
+
+    if (k == 0) {
+      /* Not one valid entry was found, send error.  If nickname was used
+        in query send error based on that, otherwise the query->errors
+        already includes proper errors. */
+      if (query->nickname)
+       silc_server_query_add_error(server, query, TRUE, 1,
+                                   SILC_STATUS_ERR_NO_SUCH_NICK);
+    }
+  }
+
+  /* Send servers */
+  if (query->querycmd == SILC_COMMAND_IDENTIFY && servers_count) {
+    SilcServerEntry entry;
+
+    if (status == SILC_STATUS_OK && servers_count > 1)
+      status = SILC_STATUS_LIST_START;
+
+    k = 0;
+    for (i = 0; i < servers_count; i++) {
+      entry = servers[i];
+      
+      if (k >= 1)
+       status = SILC_STATUS_LIST_ITEM;
+      if (servers_count > 1 && k == servers_count - 1 && !channels_count &&
+         !query->errors_count)
+       status = SILC_STATUS_LIST_END;
+      if (query->reply_count && k - 1 == query->reply_count)
+       status = SILC_STATUS_LIST_END;
+      
+      SILC_LOG_DEBUG(("%s: server %s",
+                     (status == SILC_STATUS_OK ?         "   OK" :
+                      status == SILC_STATUS_LIST_START ? "START" :
+                      status == SILC_STATUS_LIST_ITEM  ? " ITEM" :
+                      status == SILC_STATUS_LIST_END  ?  "  END" :
+                      "      : "),
+                     entry->server_name ? entry->server_name : ""));
+
+      /* Send command reply */
+      idp = silc_id_payload_encode(entry->id, SILC_ID_SERVER);
+      silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_IDENTIFY,
+                                    status, 0, ident, 2,
+                                    2, idp->data, idp->len, 
+                                    3, entry->server_name, 
+                                    entry->server_name ? 
+                                    strlen(entry->server_name) : 0);
+      silc_buffer_free(idp);
+      
+      if (status == SILC_STATUS_LIST_END)
+       break;
+      k++;
+    }
+  }
+
+  /* Send channels */
+  if (query->querycmd == SILC_COMMAND_IDENTIFY && channels_count) {
+    SilcChannelEntry entry;
+
+    if (status == SILC_STATUS_OK && channels_count > 1)
+      status = SILC_STATUS_LIST_START;
+
+    k = 0;
+    for (i = 0; i < channels_count; i++) {
+      entry = channels[i];
+      
+      if (k >= 1)
+       status = SILC_STATUS_LIST_ITEM;
+      if (channels_count > 1 && k == channels_count - 1 &&
+         !query->errors_count)
+       status = SILC_STATUS_LIST_END;
+      if (query->reply_count && k - 1 == query->reply_count)
+       status = SILC_STATUS_LIST_END;
+      
+      SILC_LOG_DEBUG(("%s: channel %s",
+                     (status == SILC_STATUS_OK ?         "   OK" :
+                      status == SILC_STATUS_LIST_START ? "START" :
+                      status == SILC_STATUS_LIST_ITEM  ? " ITEM" :
+                      status == SILC_STATUS_LIST_END  ?  "  END" :
+                      "      : "),
+                     entry->channel_name ? entry->channel_name : ""));
+
+      /* Send command reply */
+      idp = silc_id_payload_encode(entry->id, SILC_ID_CHANNEL);
+      silc_server_send_command_reply(server, cmd->sock, SILC_COMMAND_IDENTIFY,
+                                    status, 0, ident, 2,
+                                    2, idp->data, idp->len, 
+                                    3, entry->channel_name, 
+                                    entry->channel_name ? 
+                                    strlen(entry->channel_name) : 0);
+      silc_buffer_free(idp);
+      
+      if (status == SILC_STATUS_LIST_END)
+       break;
+      k++;
+    }
+  }
+
+  /* Send errors */
+  if (query->errors_count) {
+    int type;
+
+    if (status == SILC_STATUS_OK && query->errors_count > 1)
+      status = SILC_STATUS_LIST_START;
+
+    k = 0;
+    for (i = 0; i < query->errors_count; i++) {
+      idp = NULL;
+
+      /* Take error argument */
+      if (query->errors[i].from_cmd) {
+       tmp = silc_argument_get_arg_type(cmd->args,
+                                        query->errors[i].index, &len);
+       if (query->errors[i].index == 1)
+         type = 3;                 /* Nickname */
+       else
+         type = 2;                 /* ID */
+      } else if (!query->errors[i].id) {
+       idp =
+         silc_id_payload_encode(query->ids[query->errors[i].index].id,
+                                query->ids[query->errors[k].index].id_type);
+       tmp = idp->data;
+       len = idp->len;
+       type = 2;
+      } else {
+       idp = silc_id_payload_encode(query->errors[i].id,
+                                    query->errors[k].id_type);
+       tmp = idp->data;
+       len = idp->len;
+       type = 2;
+      }
+
+      if (k >= 1)
+       status = SILC_STATUS_LIST_ITEM;
+      if (query->errors_count > 1 && k == query->errors_count - 1)
+       status = SILC_STATUS_LIST_END;
+      if (query->reply_count && k - 1 == query->reply_count)
+       status = SILC_STATUS_LIST_END;
+
+      SILC_LOG_DEBUG(("%s: ERROR: %s (%d)",
+                     (status == SILC_STATUS_OK ?         "   OK" :
+                      status == SILC_STATUS_LIST_START ? "START" :
+                      status == SILC_STATUS_LIST_ITEM  ? " ITEM" :
+                      status == SILC_STATUS_LIST_END  ?  "  END" :
+                      "      : "), 
+                     silc_get_status_message(query->errors[i].error),
+                     query->errors[i].error));
+
+      /* Send error */
+      silc_server_send_command_reply(server, cmd->sock, query->querycmd,
+                                    (status == SILC_STATUS_OK ?
+                                     query->errors[i].error : status),
+                                    (status == SILC_STATUS_OK ?
+                                     0 : query->errors[i].error), ident, 1,
+                                    type, tmp, len);
+      silc_buffer_free(idp);
+
+      if (status == SILC_STATUS_LIST_END)
+       break;
+      k++;
+    }
+  }
+
+  /* Cleanup */
+  silc_server_query_free(query);
 }
 
 /* Find client by the Client ID indicated by the `client_id', and if not
@@ -824,6 +1455,8 @@ SilcClientEntry silc_server_query_client(SilcServer server,
 {
   SilcClientEntry client;
 
+  SILC_LOG_DEBUG(("Resolving client by client ID"));
+
   if (resolved)
     *resolved = FALSE;