More checks for not having purge timeout for global clients that

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

diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c
index 9b344cda9a157b17729b19fe2a7bce772b7dc4c7..ecf6f3c22ff8614c6801093b7cee17d2ed9cc8c6 100644 (file)
--- a/apps/silcd/command_reply.c
+++ b/apps/silcd/command_reply.c
@@ -143,6 +143,7 @@ silc_server_command_process_error(SilcServerCommandReplyContext cmd,
        if (client) {
          silc_server_remove_from_channels(server, NULL, client, TRUE, 
                                           NULL, TRUE);
+         silc_idlist_del_data(client);
          silc_idlist_del_client(server->global_list, client);
        }
        silc_free(client_id);
@@ -209,8 +210,7 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd)
     client = silc_idlist_add_client(server->global_list, nick, 
                                    strdup(username), 
                                    strdup(realname), client_id, 
-                                   cmd->sock->user_data, NULL, 
-                                   time(NULL) + 300);
+                                   cmd->sock->user_data, NULL, 0);
     if (!client) {
       SILC_LOG_ERROR(("Could not add new client to the ID Cache"));
       return FALSE;
@@ -249,7 +249,7 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd)
     /* Create new cache entry */
     silc_idcache_add(global ? server->global_list->clients :
                     server->local_list->clients, nick, client->id, 
-                    client, 0, &cache); 
+                    client, 0, NULL); 
     silc_free(client_id);
   }
 
@@ -267,11 +267,16 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd)
       silc_server_save_user_channels(server, cmd->sock, client, NULL, NULL);
     }
 
-    if (cache)
-      /* If client is global and is not on any channel then add that we'll
-        expire the entry after a while. */
-      if (global && !silc_hash_table_count(client->channels))
+    /* If client is global and is not on any channel then add that we'll
+       expire the entry after a while. */
+    if (global) {
+      silc_idlist_find_client_by_id(server->global_list, client->id,
+                                   FALSE, &cache);
+      if (!silc_hash_table_count(client->channels))
        cache->expire = time(NULL) + 300;
+      else
+       cache->expire = 0;
+    }
   }
 
   if (fingerprint && flen == sizeof(client->data.fingerprint))
@@ -396,6 +401,17 @@ silc_server_command_reply_whowas_save(SilcServerCommandReplyContext cmd)
                     client, 0, NULL);
   }
 
+  /* If client is global and is not on any channel then add that we'll
+     expire the entry after a while. */
+  if (global) {
+    silc_idlist_find_client_by_id(server->global_list, client->id,
+                                 FALSE, &cache);
+    if (!silc_hash_table_count(client->channels))
+      cache->expire = SILC_ID_CACHE_EXPIRE_DEF;
+    else
+      cache->expire = 0;
+  }
+
   silc_free(client_id);
 
   return TRUE;
@@ -490,8 +506,8 @@ silc_server_command_reply_identify_save(SilcServerCommandReplyContext cmd)
         global. */
       client = silc_idlist_add_client(server->global_list, nick, 
                                      info ? strdup(info) : NULL, NULL,
-                                     client_id, cmd->sock->user_data, NULL,
-                                     time(NULL) + 300);
+                                     client_id, cmd->sock->user_data,
+                                     NULL, time(NULL) + 300);
       if (!client) {
        SILC_LOG_ERROR(("Could not add new client to the ID Cache"));
        goto error;
@@ -525,18 +541,24 @@ silc_server_command_reply_identify_save(SilcServerCommandReplyContext cmd)
       client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
       
       if (name) {
-       /* If client is global and is not on any channel then add that we'll
-          expire the entry after a while. */
-       if (global && !silc_hash_table_count(client->channels) &&
-           server->server_type == SILC_SERVER)
-         expire = time(NULL) + 300;
-
        /* Add new cache entry */
        silc_idcache_add(global ? server->global_list->clients :
                         server->local_list->clients, nick, client->id, 
                         client, expire, NULL);
       }
 
+      /* If client is global and is not on any channel then add that we'll
+         expire the entry after a while. */
+      if (global && server->server_type == SILC_SERVER) {
+       SilcIDCacheEntry cache = NULL;
+        silc_idlist_find_client_by_id(server->global_list, client->id,
+                                     FALSE, &cache);
+        if (!silc_hash_table_count(client->channels))
+         cache->expire = time(NULL) + 300;
+        else
+         cache->expire = 0;
+      }
+
       silc_free(client_id);
     }
 
@@ -566,7 +588,8 @@ silc_server_command_reply_identify_save(SilcServerCommandReplyContext cmd)
       /* We don't have that server anywhere, add it. */
       server_entry = silc_idlist_add_server(server->global_list, 
                                            strdup(name), 0,
-                                           server_id, NULL, NULL);
+                                           server_id, server->router,
+                                           SILC_PRIMARY_ROUTE(server));
       if (!server_entry) {
        silc_free(server_id);
        goto error;
@@ -601,7 +624,7 @@ silc_server_command_reply_identify_save(SilcServerCommandReplyContext cmd)
       if (server->server_type != SILC_SERVER)
        goto error;
       
-      /* We don't have that server anywhere, add it. */
+      /* We don't have that channel anywhere, add it. */
       channel = silc_idlist_add_channel(server->global_list, strdup(name),
                                        SILC_CHANNEL_MODE_NONE, channel_id, 
                                        server->router, NULL, NULL, 0);
@@ -693,7 +716,8 @@ SILC_SERVER_CMD_REPLY_FUNC(info)
       /* Add the server to global list */
       server_id = silc_id_dup(server_id, SILC_ID_SERVER);
       entry = silc_idlist_add_server(server->global_list, name, 0,
-                                    server_id, NULL, NULL);
+                                    server_id, cmd->sock->user_data,
+                                    cmd->sock);
       if (!entry) {
        silc_free(server_id);
        goto out;
@@ -781,6 +805,7 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   char *channel_name, *tmp;
   SilcUInt32 mode, created;
   SilcBuffer keyp = NULL, client_id_list = NULL, client_mode_list = NULL;
+  SilcPublicKey founder_key = NULL;
 
   COMMAND_CHECK_STATUS;
 
@@ -860,6 +885,11 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   silc_buffer_pull_tail(client_mode_list, len);
   silc_buffer_put(client_mode_list, tmp, len);
 
+  /* Get founder key */
+  tmp = silc_argument_get_arg_type(cmd->args, 15, &len);
+  if (tmp)
+    silc_pkcs_public_key_decode(tmp, len, &founder_key);
+
   /* See whether we already have the channel. */
   entry = silc_idlist_find_channel_by_name(server->local_list, 
                                           channel_name, &cache);
@@ -886,6 +916,7 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
       goto out;
     }
     server->stat.my_channels++;
+    server->stat.channels++;
   } else {
     /* The entry exists. */
 
@@ -899,11 +930,17 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
        them in the entry */
     if (!(mode & SILC_CHANNEL_MODE_FOUNDER_AUTH) && entry->founder_key) {
       silc_pkcs_public_key_free(entry->founder_key);
-      silc_free(entry->founder_passwd);
-      entry->founder_passwd = NULL;
+      entry->founder_key = NULL;
     }
   }
 
+  if (founder_key) {
+    if (entry->founder_key)
+      silc_pkcs_public_key_free(entry->founder_key);
+    entry->founder_key = founder_key;
+    founder_key = NULL;
+  }
+
   if (entry->hmac_name && hmac) {
     silc_free(entry->hmac_name);
     entry->hmac_name = strdup(silc_hmac_get_name(hmac));
@@ -963,6 +1000,7 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   silc_free(client_id);
   silc_server_command_reply_free(cmd);
 
+  silc_pkcs_public_key_free(founder_key);
   if (client_id_list)
     silc_buffer_free(client_id_list);
   if (client_mode_list)
@@ -1047,7 +1085,7 @@ SILC_SERVER_CMD_REPLY_FUNC(users)
        goto out;
 
       idp = silc_id_payload_encode(channel_id, SILC_ID_CHANNEL);
-      silc_server_send_command(server, server->router->connection,
+      silc_server_send_command(server, SILC_PRIMARY_ROUTE(server),
                               SILC_COMMAND_IDENTIFY, ++server->cmd_ident,
                               1, 5, idp->data, idp->len);
       silc_buffer_free(idp);