Code auditing weekend results and fixes committing.

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

diff --git a/apps/silcd/idlist.c b/apps/silcd/idlist.c
index ba06733d5272a145ce8128a49ed408ce6ecda1fd..1a56eeabdd9eda4e00f080ba194dffeff734b9c1 100644 (file)
--- a/apps/silcd/idlist.c
+++ b/apps/silcd/idlist.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 
-  Copyright (C) 1997 - 2000 Pekka Riikonen
+  Copyright (C) 1997 - 2001 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
@@ -116,7 +116,8 @@ silc_idlist_find_server_by_id(SilcIDList id_list, SilcServerID *id,
   if (!id)
     return NULL;
 
-  SILC_LOG_DEBUG(("Finding server by ID"));
+  SILC_LOG_DEBUG(("Server ID (%s)",
+                 silc_id_render(id, SILC_ID_SERVER)));
 
   if (!silc_idcache_find_by_id_one(id_list->servers, (void *)id, 
                                   SILC_ID_SERVER, &id_cache))
@@ -156,6 +157,24 @@ silc_idlist_replace_server_id(SilcIDList id_list, SilcServerID *old_id,
   return server;
 }
 
+/* Removes and free's server entry from ID list */
+
+void silc_idlist_del_server(SilcIDList id_list, SilcServerEntry entry)
+{
+  if (entry) {
+    /* Remove from cache */
+    if (entry->id)
+      silc_idcache_del_by_id(id_list->servers, SILC_ID_SERVER, 
+                            (void *)entry->id);
+
+    /* Free data */
+    if (entry->server_name)
+      silc_free(entry->server_name);
+    if (entry->id)
+      silc_free(entry->id);
+  }
+}
+
 /******************************************************************************
 
                           Client entry functions
@@ -167,8 +186,8 @@ silc_idlist_replace_server_id(SilcIDList id_list, SilcServerID *old_id,
    called when new client connection is accepted to the server. */
 
 SilcClientEntry
-silc_idlist_add_client(SilcIDList id_list, char *nickname, char *username,
-                      char *userinfo, SilcClientID *id, 
+silc_idlist_add_client(SilcIDList id_list, unsigned char *nickname, 
+                      char *username, char *userinfo, SilcClientID *id, 
                       SilcServerEntry router, void *connection)
 {
   SilcClientEntry client;
@@ -185,7 +204,7 @@ silc_idlist_add_client(SilcIDList id_list, char *nickname, char *username,
   silc_list_init(client->channels, struct SilcChannelClientEntryStruct, 
                 client_list);
 
-  if (!silc_idcache_add(id_list->clients, client->nickname, SILC_ID_CLIENT,
+  if (!silc_idcache_add(id_list->clients, nickname, SILC_ID_CLIENT,
                        (void *)client->id, (void *)client, TRUE)) {
     silc_free(client);
     return NULL;
@@ -295,7 +314,7 @@ silc_idlist_find_client_by_nickname(SilcIDList id_list, char *nickname,
   SilcIDCacheEntry id_cache = NULL;
   SilcClientEntry client = NULL;
 
-  SILC_LOG_DEBUG(("Finding client by nickname"));
+  SILC_LOG_DEBUG(("Client by nickname"));
 
   if (server) {
     if (!silc_idcache_find_by_data(id_list->clients, nickname, &list))
@@ -326,6 +345,8 @@ silc_idlist_find_client_by_nickname(SilcIDList id_list, char *nickname,
       *ret_entry = id_cache;
   }
 
+  SILC_LOG_DEBUG(("Found"));
+
   return client;
 }
 
@@ -340,7 +361,7 @@ silc_idlist_find_client_by_hash(SilcIDList id_list, char *nickname,
   SilcClientEntry client = NULL;
   unsigned char hash[32];
 
-  SILC_LOG_DEBUG(("Finding client by hash"));
+  SILC_LOG_DEBUG(("Client by hash"));
 
   silc_hash_make(md5hash, nickname, strlen(nickname), hash);
 
@@ -371,6 +392,8 @@ silc_idlist_find_client_by_hash(SilcIDList id_list, char *nickname,
   if (ret_entry)
     *ret_entry = id_cache;
 
+  SILC_LOG_DEBUG(("Found"));
+
   return client;
 }
 
@@ -386,7 +409,8 @@ silc_idlist_find_client_by_id(SilcIDList id_list, SilcClientID *id,
   if (!id)
     return NULL;
 
-  SILC_LOG_DEBUG(("Finding client by ID"));
+  SILC_LOG_DEBUG(("Client ID (%s)", 
+                 silc_id_render(id, SILC_ID_CLIENT)));
 
   if (!silc_idcache_find_by_id_one(id_list->clients, (void *)id, 
                                   SILC_ID_CLIENT, &id_cache))
@@ -397,6 +421,8 @@ silc_idlist_find_client_by_id(SilcIDList id_list, SilcClientID *id,
   if (ret_entry)
     *ret_entry = id_cache;
 
+  SILC_LOG_DEBUG(("Found"));
+
   return client;
 }
 
@@ -427,8 +453,7 @@ silc_idlist_replace_client_id(SilcIDList id_list, SilcClientID *old_id,
      replace it with the hash of new Client ID */
   if (id_cache->data && !SILC_ID_COMPARE_HASH(old_id, id_cache->data)) {
     silc_free(id_cache->data);
-    id_cache->data = silc_calloc(sizeof(new_id->hash), 
-                                sizeof(unsigned char));
+    id_cache->data = silc_calloc(sizeof(new_id->hash), sizeof(unsigned char));
     memcpy(id_cache->data, new_id->hash, sizeof(new_id->hash));
     silc_idcache_sort_by_data(id_list->clients);
   }
@@ -518,7 +543,7 @@ silc_idlist_find_channel_by_name(SilcIDList id_list, char *name,
   SilcIDCacheEntry id_cache = NULL;
   SilcChannelEntry channel;
 
-  SILC_LOG_DEBUG(("Finding channel by name"));
+  SILC_LOG_DEBUG(("Channel by name"));
 
   if (!silc_idcache_find_by_data_loose(id_list->channels, name, &list))
     return NULL;
@@ -535,6 +560,8 @@ silc_idlist_find_channel_by_name(SilcIDList id_list, char *name,
 
   silc_idcache_list_free(list);
 
+  SILC_LOG_DEBUG(("Found"));
+
   return channel;
 }
 
@@ -550,7 +577,8 @@ silc_idlist_find_channel_by_id(SilcIDList id_list, SilcChannelID *id,
   if (!id)
     return NULL;
 
-  SILC_LOG_DEBUG(("Finding channel by ID"));
+  SILC_LOG_DEBUG(("Channel ID (%s)",
+                 silc_id_render(id, SILC_ID_CHANNEL)));
 
   if (!silc_idcache_find_by_id_one(id_list->channels, (void *)id, 
                                   SILC_ID_CHANNEL, &id_cache))
@@ -561,5 +589,7 @@ silc_idlist_find_channel_by_id(SilcIDList id_list, SilcChannelID *id,
   if (ret_entry)
     *ret_entry = id_cache;
 
+  SILC_LOG_DEBUG(("Found"));
+
   return channel;
 }