updates.

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

diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c
index d191b6b66a4ade12d1d8fb508270bc8ab385d678..6300ebc10d40c0614d96a8a7d9be324a8968c1ee 100644 (file)
--- a/apps/silcd/command_reply.c
+++ b/apps/silcd/command_reply.c
@@ -2,9 +2,9 @@
 
   command_reply.c
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 2002 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
@@ -55,6 +55,7 @@ SilcServerCommandReply silc_command_reply_list[] =
   SILC_SERVER_CMD_REPLY(info, INFO),
   SILC_SERVER_CMD_REPLY(motd, MOTD),
   SILC_SERVER_CMD_REPLY(join, JOIN),
+  SILC_SERVER_CMD_REPLY(stats, STATS),
   SILC_SERVER_CMD_REPLY(users, USERS),
   SILC_SERVER_CMD_REPLY(getkey, GETKEY),
   SILC_SERVER_CMD_REPLY(list, LIST),
@@ -72,7 +73,7 @@ void silc_server_command_reply_process(SilcServer server,
   SilcServerCommandReplyContext ctx;
   SilcCommandPayload payload;
   SilcCommand command;
-  uint16 ident;
+  SilcUInt16 ident;
 
   SILC_LOG_DEBUG(("Start"));
 
@@ -139,7 +140,7 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd)
   SilcClientEntry client;
   char global = FALSE;
   char *nick;
-  uint32 mode = 0, len, id_len, flen;
+  SilcUInt32 mode = 0, len, id_len, flen;
   int expire = 0;
 
   id_data = silc_argument_get_arg_type(cmd->args, 2, &id_len);
@@ -158,7 +159,7 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd)
   if (tmp)
     SILC_GET32_MSB(mode, tmp);
 
-  client_id = silc_id_payload_parse_id(id_data, id_len);
+  client_id = silc_id_payload_parse_id(id_data, id_len, NULL);
   if (!client_id)
     return FALSE;
 
@@ -275,10 +276,10 @@ SILC_SERVER_CMD_REPLY_FUNC(whois)
   if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID &&
       cmd->sock->type == SILC_SOCKET_TYPE_ROUTER) {
     SilcClientEntry client;
-    uint32 tmp_len;
+    SilcUInt32 tmp_len;
     unsigned char *tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
     if (tmp) {
-      SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len);
+      SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
       if (client_id) {
        SILC_LOG_DEBUG(("Received invalid client ID notification, deleting "
                        "the entry from cache"));
@@ -304,7 +305,7 @@ static char
 silc_server_command_reply_whowas_save(SilcServerCommandReplyContext cmd)
 {
   SilcServer server = cmd->server;
-  uint32 len, id_len;
+  SilcUInt32 len, id_len;
   unsigned char *id_data;
   char *nickname, *username, *realname, *servername = NULL;
   SilcClientID *client_id;
@@ -321,7 +322,7 @@ silc_server_command_reply_whowas_save(SilcServerCommandReplyContext cmd)
 
   realname = silc_argument_get_arg_type(cmd->args, 5, &len);
 
-  client_id = silc_id_payload_parse_id(id_data, id_len);
+  client_id = silc_id_payload_parse_id(id_data, id_len, NULL);
   if (!client_id)
     return FALSE;
 
@@ -416,7 +417,7 @@ static char
 silc_server_command_reply_identify_save(SilcServerCommandReplyContext cmd)
 {
   SilcServer server = cmd->server;
-  uint32 len, id_len;
+  SilcUInt32 len, id_len;
   unsigned char *id_data;
   char *name, *info;
   SilcClientID *client_id = NULL;
@@ -636,10 +637,10 @@ SILC_SERVER_CMD_REPLY_FUNC(identify)
   if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID &&
       cmd->sock->type == SILC_SOCKET_TYPE_ROUTER) {
     SilcClientEntry client;
-    uint32 tmp_len;
+    SilcUInt32 tmp_len;
     unsigned char *tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
     if (tmp) {
-      SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len);
+      SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
       if (client_id) {
        SILC_LOG_DEBUG(("Received invalid client ID notification, deleting "
                        "the entry from cache"));
@@ -668,7 +669,7 @@ SILC_SERVER_CMD_REPLY_FUNC(info)
   SilcCommandStatus status;
   SilcServerEntry entry;
   SilcServerID *server_id;
-  uint32 tmp_len;
+  SilcUInt32 tmp_len;
   unsigned char *tmp, *name;
 
   COMMAND_CHECK_STATUS;
@@ -677,7 +678,7 @@ SILC_SERVER_CMD_REPLY_FUNC(info)
   tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
   if (!tmp)
     goto out;
-  server_id = silc_id_payload_parse_id(tmp, tmp_len);
+  server_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
   if (!server_id)
     goto out;
 
@@ -725,7 +726,7 @@ SILC_SERVER_CMD_REPLY_FUNC(motd)
   SilcCommandStatus status;
   SilcServerEntry entry = NULL;
   SilcServerID *server_id;
-  uint32 tmp_len;
+  SilcUInt32 tmp_len;
   unsigned char *tmp;
 
   COMMAND_CHECK_STATUS;
@@ -734,7 +735,7 @@ SILC_SERVER_CMD_REPLY_FUNC(motd)
   tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
   if (!tmp)
     goto out;
-  server_id = silc_id_payload_parse_id(tmp, tmp_len);
+  server_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
   if (!server_id)
     goto out;
 
@@ -776,10 +777,10 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   SilcClientID *client_id = NULL;
   SilcChannelEntry entry;
   SilcHmac hmac = NULL;
-  uint32 id_len, len, list_count;
+  SilcUInt32 id_len, len, list_count;
   unsigned char *id_string;
   char *channel_name, *tmp;
-  uint32 mode, created;
+  SilcUInt32 mode, created;
   SilcBuffer keyp = NULL, client_id_list = NULL, client_mode_list = NULL;
 
   COMMAND_CHECK_STATUS;
@@ -798,7 +799,7 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   tmp = silc_argument_get_arg_type(cmd->args, 4, &len);
   if (!tmp)
     goto out;
-  client_id = silc_id_payload_parse_id(tmp, len);
+  client_id = silc_id_payload_parse_id(tmp, len, NULL);
   if (!client_id)
     goto out;
 
@@ -825,7 +826,7 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   }
 
   /* Parse the Channel ID */
-  id = silc_id_payload_parse_id(id_string, id_len);
+  id = silc_id_payload_parse_id(id_string, id_len, NULL);
   if (!id)
     goto out;
 
@@ -872,19 +873,14 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
 
     /* If the channel is found from global list we must move it to the
        local list. */
-    entry = silc_idlist_find_channel_by_name(server->global_list, 
+    entry = silc_idlist_find_channel_by_name(server->global_list,
                                             channel_name, &cache);
-    if (entry) {
-      if (entry->rekey) {
-       silc_schedule_task_del_by_context(server->schedule, entry->rekey);
-       SILC_LOG_ERROR(("global_list->channels: entry->rekey != NULL, inform Pekka now!!!"));
-      }
+    if (entry)
       silc_idlist_del_channel(server->global_list, entry);
-    }
 
     /* Add the channel to our local list. */
-    entry = silc_idlist_add_channel(server->local_list, strdup(channel_name), 
-                                   SILC_CHANNEL_MODE_NONE, id, 
+    entry = silc_idlist_add_channel(server->local_list, strdup(channel_name),
+                                   SILC_CHANNEL_MODE_NONE, id,
                                    server->router, NULL, hmac, 0);
     if (!entry) {
       silc_free(id);
@@ -918,16 +914,14 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   tmp = silc_argument_get_arg_type(cmd->args, 8, &len);
   if (tmp) {
     silc_free(entry->ban_list);
-    entry->ban_list = silc_calloc(len, sizeof(*entry->ban_list));
-    memcpy(entry->ban_list, tmp, len);
+    entry->ban_list = silc_memdup(tmp, len);
   }
 
   /* Get the invite list */
   tmp = silc_argument_get_arg_type(cmd->args, 9, &len);
   if (tmp) {
     silc_free(entry->invite_list);
-    entry->invite_list = silc_calloc(len, sizeof(*entry->invite_list));
-    memcpy(entry->invite_list, tmp, len);
+    entry->invite_list = silc_memdup(tmp, len);
   }
 
   /* Get the topic */
@@ -974,6 +968,46 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
     silc_buffer_free(client_mode_list);
 }
 
+/* Received reply to STATS command.  */
+
+SILC_SERVER_CMD_REPLY_FUNC(stats)
+{
+  SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
+  SilcServer server = cmd->server;
+  SilcCommandStatus status;
+  unsigned char *tmp;
+  SilcUInt32 tmp_len;
+  SilcBufferStruct buf;
+
+  COMMAND_CHECK_STATUS;
+
+  /* Get statistics structure */
+  tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
+  if (server->server_type == SILC_SERVER && tmp) {
+    silc_buffer_set(&buf, tmp, tmp_len);
+    silc_buffer_unformat(&buf,
+                        SILC_STR_UI_INT(NULL),
+                        SILC_STR_UI_INT(NULL),
+                        SILC_STR_UI_INT(NULL),
+                        SILC_STR_UI_INT(NULL),
+                        SILC_STR_UI_INT(NULL),
+                        SILC_STR_UI_INT(NULL),
+                        SILC_STR_UI_INT(&server->stat.cell_clients),
+                        SILC_STR_UI_INT(&server->stat.cell_channels),
+                        SILC_STR_UI_INT(&server->stat.cell_servers),
+                        SILC_STR_UI_INT(&server->stat.clients),
+                        SILC_STR_UI_INT(&server->stat.channels),
+                        SILC_STR_UI_INT(&server->stat.servers),
+                        SILC_STR_UI_INT(&server->stat.routers),
+                        SILC_STR_UI_INT(&server->stat.server_ops),
+                        SILC_STR_UI_INT(&server->stat.router_ops),
+                        SILC_STR_END);
+  }
+
+ out:
+  SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
+}
+
 SILC_SERVER_CMD_REPLY_FUNC(users)
 {
   SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
@@ -984,8 +1018,8 @@ SILC_SERVER_CMD_REPLY_FUNC(users)
   SilcBuffer client_id_list;
   SilcBuffer client_mode_list;
   unsigned char *tmp;
-  uint32 tmp_len;
-  uint32 list_count;
+  SilcUInt32 tmp_len;
+  SilcUInt32 list_count;
 
   COMMAND_CHECK_STATUS;
 
@@ -993,7 +1027,7 @@ SILC_SERVER_CMD_REPLY_FUNC(users)
   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);
+  channel_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
   if (!channel_id)
     goto out;
 
@@ -1074,8 +1108,8 @@ SILC_SERVER_CMD_REPLY_FUNC(getkey)
   SilcServerID *server_id = NULL;
   SilcSKEPKType type;
   unsigned char *tmp, *pk;
-  uint32 len;
-  uint16 pk_len;
+  SilcUInt32 len;
+  SilcUInt16 pk_len;
   SilcIDPayload idp = NULL;
   SilcIdType id_type;
   SilcPublicKey public_key = NULL;
@@ -1156,15 +1190,15 @@ SILC_SERVER_CMD_REPLY_FUNC(list)
   SilcChannelID *channel_id = NULL;
   SilcChannelEntry channel;
   SilcIDCacheEntry cache;
-  uint32 len;
+  SilcUInt32 len;
   unsigned char *tmp, *name, *topic;
-  uint32 usercount = 0;
+  SilcUInt32 usercount = 0;
   bool global_list = FALSE;
 
   COMMAND_CHECK_STATUS_LIST;
 
   tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
-  channel_id = silc_id_payload_parse_id(tmp, len);
+  channel_id = silc_id_payload_parse_id(tmp, len, NULL);
   if (!channel_id)
     goto out;