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
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))
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);
+
+ memset(entry, 'F', sizeof(*entry));
+ silc_free(entry);
+ }
+}
+
/******************************************************************************
Client entry functions
/* Add new client entry. This adds the client entry to ID cache system
and returns the allocated client entry or NULL on error. This is
- called when new client connection is accepted to the server. */
+ called when new client connection is accepted to the server. If The
+ `router' is provided then the all server routines assume that the client
+ is not directly connected local client but it has router set and is
+ remote. If this is the case then `connection' must be NULL. If, on the
+ other hand, the `connection' is provided then the client is assumed
+ to be directly connected local client and `router' must be NULL. */
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;
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;
/* Free client entry. This free's everything and removes the entry
from ID cache. Call silc_idlist_del_data before calling this one. */
-void silc_idlist_del_client(SilcIDList id_list, SilcClientEntry entry)
+int silc_idlist_del_client(SilcIDList id_list, SilcClientEntry entry)
{
if (entry) {
/* Remove from cache */
if (entry->id)
- silc_idcache_del_by_id(id_list->clients, SILC_ID_CLIENT,
- (void *)entry->id);
+ if (!silc_idcache_del_by_id(id_list->clients, SILC_ID_CLIENT,
+ (void *)entry->id))
+ return FALSE;
/* Free data */
if (entry->nickname)
silc_free(entry->userinfo);
if (entry->id)
silc_free(entry->id);
+
+ memset(entry, 'F', sizeof(*entry));
+ silc_free(entry);
+
+ return TRUE;
}
+
+ return FALSE;
}
/* Returns all clients matching requested nickname. Number of clients is
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))
*ret_entry = id_cache;
}
+ SILC_LOG_DEBUG(("Found"));
+
return client;
}
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);
if (ret_entry)
*ret_entry = id_cache;
+ SILC_LOG_DEBUG(("Found"));
+
return client;
}
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))
if (ret_entry)
*ret_entry = id_cache;
+ SILC_LOG_DEBUG(("Found"));
+
return client;
}
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);
}
+ SILC_LOG_DEBUG(("Replaced"));
+
return client;
}
/* Free channel entry. This free's everything. */
-void silc_idlist_del_channel(SilcIDList id_list, SilcChannelEntry entry)
+int silc_idlist_del_channel(SilcIDList id_list, SilcChannelEntry entry)
{
if (entry) {
SilcChannelClientEntry chl;
/* Remove from cache */
if (entry->id)
- silc_idcache_del_by_id(id_list->channels, SILC_ID_CHANNEL,
- (void *)entry->id);
+ if (!silc_idcache_del_by_id(id_list->channels, SILC_ID_CHANNEL,
+ (void *)entry->id))
+ return FALSE;
/* Free data */
if (entry->channel_name)
memset(entry->key, 0, entry->key_len / 8);
silc_free(entry->key);
}
- memset(entry->iv, 0, sizeof(entry->iv));
silc_list_start(entry->user_list);
while ((chl = silc_list_get(entry->user_list)) != SILC_LIST_END) {
silc_list_del(entry->user_list, chl);
silc_free(chl);
}
+
+ memset(entry, 'F', sizeof(*entry));
+ silc_free(entry);
+ return TRUE;
}
+
+ return FALSE;
}
/* Finds channel by channel name. Channel names are unique and they
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;
silc_idcache_list_free(list);
+ SILC_LOG_DEBUG(("Found"));
+
return channel;
}
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))
if (ret_entry)
*ret_entry = id_cache;
+ SILC_LOG_DEBUG(("Found"));
+
+ return channel;
+}
+
+/* Replaces old Channel ID with new one. This is done when router forces
+ normal server to change Channel ID. */
+
+SilcChannelEntry
+silc_idlist_replace_channel_id(SilcIDList id_list, SilcChannelID *old_id,
+ SilcChannelID *new_id)
+{
+ SilcIDCacheEntry id_cache = NULL;
+ SilcChannelEntry channel;
+
+ if (!old_id || !new_id)
+ return NULL;
+
+ SILC_LOG_DEBUG(("Replacing Channel ID"));
+
+ if (!silc_idcache_find_by_id_one(id_list->channels, (void *)old_id,
+ SILC_ID_CHANNEL, &id_cache))
+ return NULL;
+
+ channel = (SilcChannelEntry)id_cache->context;
+ silc_free(channel->id);
+ channel->id = new_id;
+ id_cache->id = (void *)new_id;
+
return channel;
}
projects / silc.git / blobdiff