Updates.

[silc.git] / apps / silcd / command_reply.c

diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c
index d248f83e21a88881dd08bdf1c135b983e5916fa6..073bf822477dc3332e990347004644c83f8ef499 100644 (file)
--- a/apps/silcd/command_reply.c
+++ b/apps/silcd/command_reply.c
@@ -25,6 +25,7 @@
 
 #define COMMAND_CHECK_STATUS                                             \
 do {                                                                     \
+  SILC_LOG_DEBUG(("Start"));                                             \
   SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); \
   if (status != SILC_STATUS_OK) {                                        \
     silc_server_command_reply_free(cmd);                                 \
@@ -34,6 +35,7 @@ do {                                                                    \
 
 #define COMMAND_CHECK_STATUS_LIST                                        \
 do {                                                                     \
+  SILC_LOG_DEBUG(("Start"));                                             \
   SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); \
   if (status != SILC_STATUS_OK &&                                        \
       status != SILC_STATUS_LIST_START &&                                \
@@ -51,6 +53,7 @@ SilcServerCommandReply silc_command_reply_list[] =
   SILC_SERVER_CMD_REPLY(join, JOIN),
   SILC_SERVER_CMD_REPLY(whois, WHOIS),
   SILC_SERVER_CMD_REPLY(identify, IDENTIFY),
+  SILC_SERVER_CMD_REPLY(users, USERS),
 
   { NULL, 0 },
 };
@@ -219,8 +222,6 @@ SILC_SERVER_CMD_REPLY_FUNC(whois)
   SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
   SilcCommandStatus status;
 
-  SILC_LOG_DEBUG(("Start"));
-
   COMMAND_CHECK_STATUS_LIST;
 
   if (!silc_server_command_reply_whois_save(cmd))
@@ -356,8 +357,6 @@ SILC_SERVER_CMD_REPLY_FUNC(identify)
   SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
   SilcCommandStatus status;
 
-  SILC_LOG_DEBUG(("Start"));
-
   COMMAND_CHECK_STATUS_LIST;
 
   if (!silc_server_command_reply_identify_save(cmd))
@@ -405,8 +404,6 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   unsigned int mode, created;
   SilcBuffer keyp;
 
-  SILC_LOG_DEBUG(("Start"));
-
   COMMAND_CHECK_STATUS;
 
   /* Get channel name */
@@ -447,7 +444,7 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
     /* Add new channel */
 
     SILC_LOG_DEBUG(("Adding new [%s] channel %s id(%s)", 
-                   (created == 0 ? "created" : "existing"), channel_name,
+                   (created == 0 ? "existing" : "created"), channel_name,
                    silc_id_render(id, SILC_ID_CHANNEL)));
 
     /* Add the channel to our local list. */
@@ -486,3 +483,112 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
  out:
   silc_server_command_reply_free(cmd);
 }
+
+SILC_SERVER_CMD_REPLY_FUNC(users)
+{
+  SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
+  SilcServer server = cmd->server;
+  SilcCommandStatus status;
+  SilcChannelEntry channel;
+  SilcChannelID *channel_id = NULL;
+  SilcBuffer client_id_list;
+  SilcBuffer client_mode_list;
+  unsigned char *tmp;
+  unsigned int tmp_len;
+  unsigned int list_count, i;
+
+  COMMAND_CHECK_STATUS;
+
+  /* Get channel ID */
+  tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
+  if (!tmp)
+    goto out;
+  channel_id = silc_id_payload_parse_id(tmp, tmp_len);
+
+  /* Get the list count */
+  tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
+  if (!tmp)
+    goto out;
+  SILC_GET32_MSB(list_count, tmp);
+
+  /* Get Client ID list */
+  tmp = silc_argument_get_arg_type(cmd->args, 4, &tmp_len);
+  if (!tmp)
+    goto out;
+
+  client_id_list = silc_buffer_alloc(tmp_len);
+  silc_buffer_pull_tail(client_id_list, tmp_len);
+  silc_buffer_put(client_id_list, tmp, tmp_len);
+
+  /* Get client mode list */
+  tmp = silc_argument_get_arg_type(cmd->args, 5, &tmp_len);
+  if (!tmp)
+    goto out;
+
+  client_mode_list = silc_buffer_alloc(tmp_len);
+  silc_buffer_pull_tail(client_mode_list, tmp_len);
+  silc_buffer_put(client_mode_list, tmp, tmp_len);
+
+  /* Get channel entry */
+  channel = silc_idlist_find_channel_by_id(server->local_list, 
+                                          channel_id, NULL);
+  if (!channel) {
+    channel = silc_idlist_find_channel_by_id(server->global_list, 
+                                            channel_id, NULL);
+    if (!channel)
+      goto out;
+  }
+
+  /* Cache the received Client ID's and modes. This cache expires
+     whenever server sends notify message to channel. It means two things;
+     some user has joined or leaved the channel. XXX! */
+  for (i = 0; i < list_count; i++) {
+    unsigned short idp_len;
+    unsigned int mode;
+    SilcClientID *client_id;
+    SilcClientEntry client;
+
+    /* Client ID */
+    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);
+    silc_buffer_pull(client_id_list, idp_len);
+    
+    /* Mode */
+    SILC_GET32_MSB(mode, client_mode_list->data);
+    silc_buffer_pull(client_mode_list, 4);
+
+    /* Check if we have this client cached already. */
+    client = silc_idlist_find_client_by_id(server->local_list, client_id,
+                                          NULL);
+    if (!client)
+      client = silc_idlist_find_client_by_id(server->global_list, 
+                                            client_id, NULL);
+    if (!client) {
+      /* If router did not find such Client ID in its lists then this must
+        be bogus client or some router in the net is buggy. */
+      if (server->server_type == SILC_ROUTER)
+       goto out;
+
+      /* We don't have that client anywhere, add it. The client is added
+        to global list since server didn't have it in the lists so it must be 
+        global. */
+      silc_idlist_add_client(server->global_list, NULL, NULL, NULL,
+                            client_id, NULL, NULL);
+    } else {
+      /* We have the client already. */
+      silc_free(client_id);
+    }
+  }
+
+  silc_buffer_free(client_id_list);
+  silc_buffer_free(client_mode_list);
+
+  /* Execute any pending commands */
+  SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_USERS);
+
+ out:
+  if (channel_id)
+    silc_free(channel_id);
+  silc_server_command_reply_free(cmd);
+}