Added support for removing unconfigured client connections in

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

diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c
index 63b528fc707597b74692178965e269ab0149ff60..bff81fa6644965d02569106e54f6924721fe894d 100644 (file)
--- a/apps/silcd/command_reply.c
+++ b/apps/silcd/command_reply.c
@@ -66,7 +66,6 @@ void silc_server_command_reply_process(SilcServer server,
   SilcServerCommandReplyContext ctx;
   SilcCommandPayload payload;
   SilcCommand command;
-  SilcUInt16 ident;
 
   SILC_LOG_DEBUG(("Start"));
 
@@ -85,13 +84,12 @@ void silc_server_command_reply_process(SilcServer server,
   ctx->sock = silc_socket_dup(sock);
   ctx->payload = payload;
   ctx->args = silc_command_get_args(ctx->payload);
-  ident = silc_command_get_ident(ctx->payload);
+  ctx->ident = silc_command_get_ident(ctx->payload);
       
   /* Check for pending commands and mark to be exeucted */
   ctx->callbacks = 
-    silc_server_command_pending_check(server, ctx, 
-                                     silc_command_get(ctx->payload), 
-                                     ident, &ctx->callbacks_count);
+    silc_server_command_pending_check(server, silc_command_get(ctx->payload), 
+                                     ctx->ident, &ctx->callbacks_count);
 
   /* Execute command reply */
   command = silc_command_get(ctx->payload);
@@ -143,6 +141,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 +208,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 +247,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 +265,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 +399,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 +504,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 +539,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 +586,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;
@@ -693,7 +714,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;