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
GNU General Public License for more details.
*/
-/*
- * $Id$
- * $Log$
- * Revision 1.4 2000/07/06 07:16:13 priikone
- * Added SilcPublicKey's
- *
- * Revision 1.3 2000/07/05 06:14:01 priikone
- * Global costemic changes.
- *
- * Revision 1.2 2000/07/03 05:52:11 priikone
- * Fixed typo and a bug.
- *
- * Revision 1.1.1.1 2000/06/27 11:36:56 priikone
- * Imported from internal CVS/Added Log headers.
- *
- *
- */
+/* $Id$ */
#include "serverincludes.h"
#include "idlist.h"
-/* Adds a new server to the list. The pointer sent as argument is allocated
- and returned. */
+/******************************************************************************
+
+ Common functions
+
+******************************************************************************/
-void silc_idlist_add_server(SilcServerList **list,
- char *server_name, int server_type,
- SilcServerID *id, SilcServerList *router,
- SilcCipher send_key, SilcCipher receive_key,
- SilcPKCS public_key, SilcHmac hmac,
- SilcServerList **new_idlist)
+/* This function is used to add keys and stuff to common ID entry data
+ structure. */
+
+void silc_idlist_add_data(void *entry, SilcIDListData idata)
{
- SilcServerList *last, *idlist;
+ SilcIDListData data = (SilcIDListData)entry;
+ data->send_key = idata->send_key;
+ data->receive_key = idata->receive_key;
+ data->hmac = idata->hmac;
+ data->hmac_key = idata->hmac_key;
+ data->hmac_key_len = idata->hmac_key_len;
+ data->pkcs = idata->pkcs;
+ data->public_key = idata->public_key;
+ data->last_receive = idata->last_receive;
+ data->last_sent = idata->last_sent;
+ data->registered = idata->registered;
+}
- SILC_LOG_DEBUG(("Adding new server to id list"));
+/* Free's all data in the common ID entry data structure. */
- idlist = silc_calloc(1, sizeof(*idlist));
- if (idlist == NULL) {
- SILC_LOG_ERROR(("Could not allocate new server list object"));
- *new_idlist = NULL;
- return;
+void silc_idlist_del_data(void *entry)
+{
+ SilcIDListData idata = (SilcIDListData)entry;
+ if (idata->send_key)
+ silc_cipher_free(idata->send_key);
+ if (idata->receive_key)
+ silc_cipher_free(idata->receive_key);
+ if (idata->hmac)
+ silc_hmac_free(idata->hmac);
+ if (idata->hmac_key) {
+ memset(idata->hmac_key, 0, idata->hmac_key_len);
+ silc_free(idata->hmac_key);
}
+ if (idata->pkcs)
+ silc_pkcs_free(idata->pkcs);
+ if (idata->public_key)
+ silc_pkcs_public_key_free(idata->public_key);
+}
+
+/******************************************************************************
+
+ Server entry functions
+
+******************************************************************************/
+
+/* Add new server entry. This adds the new server entry to ID cache and
+ returns the allocated entry object or NULL on error. This is called
+ when new server connects to us. We also add ourselves to cache with
+ this function. */
+
+SilcServerEntry
+silc_idlist_add_server(SilcIDList id_list,
+ char *server_name, int server_type,
+ SilcServerID *id, SilcServerEntry router,
+ void *connection)
+{
+ SilcServerEntry server;
+
+ SILC_LOG_DEBUG(("Adding new server entry"));
+
+ server = silc_calloc(1, sizeof(*server));
+ server->server_name = server_name;
+ server->server_type = server_type;
+ server->id = id;
+ server->router = router;
+ server->connection = connection;
- /* Set the pointers */
- idlist->server_name = server_name;
- idlist->server_type = server_type;
- idlist->id = id;
- idlist->router = router;
- idlist->send_key = send_key;
- idlist->receive_key = receive_key;
- idlist->pkcs = public_key;
- idlist->hmac = hmac;
- idlist->next = idlist;
- idlist->prev = idlist;
-
- /* First on the list? */
- if (!*list) {
- *list = idlist;
- *new_idlist = idlist;
- return;
+ if (!silc_idcache_add(id_list->servers, server->server_name, SILC_ID_SERVER,
+ (void *)server->id, (void *)server, TRUE)) {
+ silc_free(server);
+ return NULL;
}
- /* Add it to the list */
- last = (*list)->prev;
- last->next = idlist;
- (*list)->prev = idlist;
- idlist->next = (*list);
- idlist->prev = last;
+ return server;
+}
+
+/* Finds server by Server ID */
- if (new_idlist)
- *new_idlist = idlist;
+SilcServerEntry
+silc_idlist_find_server_by_id(SilcIDList id_list, SilcServerID *id,
+ SilcIDCacheEntry *ret_entry)
+{
+ SilcIDCacheEntry id_cache = NULL;
+ SilcServerEntry server;
+
+ if (!id)
+ return NULL;
+
+ 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 NULL;
+
+ server = (SilcServerEntry)id_cache->context;
+
+ if (ret_entry)
+ *ret_entry = id_cache;
+
+ return server;
}
-/* Adds a new client to the client list. This is called when new client
- connection is accepted to the server. This adds all the relevant data
- about the client and session with it to the list. This list is
- referenced for example when sending message to the client. */
-
-void silc_idlist_add_client(SilcClientList **list, char *nickname,
- char *username, char *userinfo,
- SilcClientID *id, SilcServerList *router,
- SilcCipher send_key, SilcCipher receive_key,
- SilcPKCS public_key, SilcHmac hmac,
- SilcClientList **new_idlist)
+/* Find server by name */
+
+SilcServerEntry
+silc_idlist_find_server_by_name(SilcIDList id_list, char *name,
+ SilcIDCacheEntry *ret_entry)
{
- SilcClientList *last, *idlist;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcServerEntry server;
+
+ SILC_LOG_DEBUG(("Server by name `%s'", name));
+
+ if (!silc_idcache_find_by_data_one(id_list->servers, name, &id_cache))
+ return NULL;
+
+ server = (SilcServerEntry)id_cache->context;
+
+ if (ret_entry)
+ *ret_entry = id_cache;
- SILC_LOG_DEBUG(("Adding new client to id list"));
+ return server;
+}
+
+/* Find server by connection parameters, hostname and port */
- idlist = silc_calloc(1, sizeof(*idlist));
- if (idlist == NULL) {
- SILC_LOG_ERROR(("Could not allocate new client list object"));
- return;
+SilcServerEntry
+silc_idlist_find_server_by_conn(SilcIDList id_list, char *hostname,
+ int port, SilcIDCacheEntry *ret_entry)
+{
+ SilcIDCacheList list = NULL;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcServerEntry server = NULL;
+ SilcSocketConnection sock;
+
+ SILC_LOG_DEBUG(("Server by hostname %s and port %d", hostname, port));
+
+ if (!silc_idcache_find_by_id(id_list->servers, SILC_ID_CACHE_ANY,
+ SILC_ID_SERVER, &list))
+ return NULL;
+
+ if (!silc_idcache_list_first(list, &id_cache)) {
+ silc_idcache_list_free(list);
+ return NULL;
}
- /* Set the pointers */
- idlist->nickname = nickname;
- idlist->username = username;
- idlist->userinfo = userinfo;
- idlist->id = id;
- idlist->router = router;
- idlist->send_key = send_key;
- idlist->receive_key = receive_key;
- idlist->pkcs = public_key;
- idlist->hmac = hmac;
- idlist->next = idlist;
- idlist->prev = idlist;
-
- /* First on the list? */
- if (!(*list)) {
- *list = idlist;
- if (new_idlist)
- *new_idlist = idlist;
- return;
+ while (id_cache) {
+ server = (SilcServerEntry)id_cache->context;
+ sock = (SilcSocketConnection)server->connection;
+
+ if (sock && (!strcmp(sock->hostname, hostname) ||
+ !strcmp(sock->ip, hostname)) && sock->port == port)
+ break;
+
+ id_cache = NULL;
+ server = NULL;
+
+ if (!silc_idcache_list_next(list, &id_cache))
+ break;
}
+
+ silc_idcache_list_free(list);
- /* Add it to the list */
- last = (*list)->prev;
- last->next = idlist;
- (*list)->prev = idlist;
- idlist->next = *list;
- idlist->prev = last;
+ if (ret_entry)
+ *ret_entry = id_cache;
- if (new_idlist)
- *new_idlist = idlist;
+ SILC_LOG_DEBUG(("Found"));
+
+ return server;
}
-/* Free client entry. This free's everything. */
+/* Replaces old Server ID with new one */
-void silc_idlist_del_client(SilcClientList **list, SilcClientList *entry)
+SilcServerEntry
+silc_idlist_replace_server_id(SilcIDList id_list, SilcServerID *old_id,
+ SilcServerID *new_id)
+{
+ SilcIDCacheEntry id_cache = NULL;
+ SilcServerEntry server;
+
+ if (!old_id || !new_id)
+ return NULL;
+
+ SILC_LOG_DEBUG(("Replacing Server ID"));
+
+ if (!silc_idcache_find_by_id_one(id_list->servers, (void *)old_id,
+ SILC_ID_SERVER, &id_cache))
+ return NULL;
+
+ server = (SilcServerEntry)id_cache->context;
+ silc_free(server->id);
+ server->id = new_id;
+ id_cache->id = (void *)new_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);
+
+ 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. 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, unsigned char *nickname,
+ char *username, char *userinfo, SilcClientID *id,
+ SilcServerEntry router, void *connection)
+{
+ SilcClientEntry client;
+
+ SILC_LOG_DEBUG(("Adding new client entry"));
+
+ client = silc_calloc(1, sizeof(*client));
+ client->nickname = nickname;
+ client->username = username;
+ client->userinfo = userinfo;
+ client->id = id;
+ client->router = router;
+ client->connection = connection;
+ silc_list_init(client->channels, struct SilcChannelClientEntryStruct,
+ client_list);
+
+ if (!silc_idcache_add(id_list->clients, nickname, SILC_ID_CLIENT,
+ (void *)client->id, (void *)client, TRUE)) {
+ silc_free(client);
+ return NULL;
+ }
+
+ return client;
+}
+
+/* Free client entry. This free's everything and removes the entry
+ from ID cache. Call silc_idlist_del_data before calling this one. */
+
+int silc_idlist_del_client(SilcIDList id_list, SilcClientEntry entry)
{
if (entry) {
+ /* Remove from cache */
+ if (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->nickname);
if (entry->username)
silc_free(entry->userinfo);
if (entry->id)
silc_free(entry->id);
- if (entry->send_key)
- silc_cipher_free(entry->send_key);
- if (entry->receive_key)
- silc_cipher_free(entry->receive_key);
- if (entry->pkcs)
- silc_pkcs_free(entry->pkcs);
- if (entry->hmac)
- silc_hmac_free(entry->hmac);
- if (entry->hmac_key) {
- memset(entry->hmac_key, 0, entry->hmac_key_len);
- silc_free(entry->hmac_key);
- }
- /* Last one in list? */
- if (*list == entry && entry->next == entry) {
- *list = NULL;
- silc_free(entry);
- return;
- }
-
- /* At the start of list? */
- if (*list == entry && entry->next != entry) {
- *list = entry->next;
- entry->next->prev = entry->prev;
- entry->prev->next = *list;
- silc_free(entry);
- return;
- }
-
- /* Remove from list */
- entry->prev->next = entry->next;
- entry->next->prev = entry->prev;
+ memset(entry, 'F', sizeof(*entry));
silc_free(entry);
- return;
+
+ return TRUE;
}
+
+ return FALSE;
}
-SilcClientList *
-silc_idlist_find_client_by_nickname(SilcClientList *list,
- char *nickname,
- char *server)
-{
- SilcClientList *first, *entry;
+/* Returns all clients matching requested nickname. Number of clients is
+ returned to `clients_count'. Caller must free the returned table. */
- SILC_LOG_DEBUG(("Finding client by nickname"));
+SilcClientEntry *
+silc_idlist_get_clients_by_nickname(SilcIDList id_list, char *nickname,
+ char *server, unsigned int *clients_count)
+{
+ SilcIDCacheList list = NULL;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcClientEntry *clients;
+ int i;
- if (!list)
+ if (!silc_idcache_find_by_data(id_list->clients, nickname, &list))
return NULL;
- first = entry = list;
- if (!strcmp(entry->nickname, nickname)) {
- SILC_LOG_DEBUG(("Found"));
- return entry;
- }
- entry = entry->next;
+ clients = silc_calloc(silc_idcache_list_count(list), sizeof(*clients));
- while(entry != first) {
- if (!strcmp(entry->nickname, nickname)) {
- SILC_LOG_DEBUG(("Found"));
- return entry;
- }
+ i = 0;
+ silc_idcache_list_first(list, &id_cache);
+ clients[i++] = (SilcClientEntry)id_cache->context;
- entry = entry->next;
- }
+ while (silc_idcache_list_next(list, &id_cache))
+ clients[i++] = (SilcClientEntry)id_cache->context;
+
+ silc_idcache_list_free(list);
+
+ if (clients_count)
+ *clients_count = i;
- return NULL;
+ return clients;
}
-SilcClientList *
-silc_idlist_find_client_by_hash(SilcClientList *list,
- char *nickname, SilcHash md5hash)
+/* Returns all clients matching requested nickname. Number of clients is
+ returned to `clients_count'. Caller must free the returned table. */
+
+SilcClientEntry *
+silc_idlist_get_clients_by_hash(SilcIDList id_list, char *nickname,
+ SilcHash md5hash,
+ unsigned int *clients_count)
{
- SilcClientList *first, *entry;
- unsigned char hash[16];
+ SilcIDCacheList list = NULL;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcClientEntry *clients;
+ unsigned char hash[32];
+ int i;
- SILC_LOG_DEBUG(("Finding client by nickname hash"));
+ silc_hash_make(md5hash, nickname, strlen(nickname), hash);
- if (!list)
+ if (!silc_idcache_find_by_data(id_list->clients, hash, &list))
return NULL;
- /* Make hash of the nickname */
- silc_hash_make(md5hash, nickname, strlen(nickname), hash);
+ clients = silc_calloc(silc_idcache_list_count(list), sizeof(*clients));
- first = entry = list;
- if (entry && !SILC_ID_COMPARE_HASH(entry->id, hash)) {
- SILC_LOG_DEBUG(("Found"));
- return entry;
- }
- entry = entry->next;
+ i = 0;
+ silc_idcache_list_first(list, &id_cache);
+ clients[i++] = (SilcClientEntry)id_cache->context;
+
+ while (silc_idcache_list_next(list, &id_cache))
+ clients[i++] = (SilcClientEntry)id_cache->context;
+
+ silc_idcache_list_free(list);
+
+ if (clients_count)
+ *clients_count = i;
+
+ return clients;
+}
+
+/* Finds client entry by nickname. */
+
+SilcClientEntry
+silc_idlist_find_client_by_nickname(SilcIDList id_list, char *nickname,
+ char *server, SilcIDCacheEntry *ret_entry)
+{
+ SilcIDCacheList list = NULL;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcClientEntry client = NULL;
+
+ SILC_LOG_DEBUG(("Client by nickname"));
- while(entry != first) {
- if (entry && !SILC_ID_COMPARE_HASH(entry->id, hash)) {
- SILC_LOG_DEBUG(("Found"));
- return entry;
+ if (server) {
+ if (!silc_idcache_find_by_data(id_list->clients, nickname, &list))
+ return NULL;
+
+#if 0
+ while (silc_idcache_list_next(list, &id_cache)) {
+ client = (SilcClientEntry)id_cache->context;
+
+ if (!strcmp(server, XXX, strlen(server)))
+ break;
+
+ client = NULL;
}
+#endif
+
+ silc_idcache_list_free(list);
+
+ if (!client)
+ return NULL;
+ } else {
+ if (!silc_idcache_find_by_data_one(id_list->clients, nickname, &id_cache))
+ return NULL;
+
+ client = (SilcClientEntry)id_cache->context;
- entry = entry->next;
+ if (ret_entry)
+ *ret_entry = id_cache;
}
- return NULL;
+ SILC_LOG_DEBUG(("Found"));
+
+ return client;
}
-SilcClientList *
-silc_idlist_find_client_by_id(SilcClientList *list, SilcClientID *id)
+/* Finds client by nickname hash. */
+
+SilcClientEntry
+silc_idlist_find_client_by_hash(SilcIDList id_list, char *nickname,
+ SilcHash md5hash, SilcIDCacheEntry *ret_entry)
{
- SilcClientList *first, *entry;
+ SilcIDCacheList list = NULL;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcClientEntry client = NULL;
+ unsigned char hash[32];
+
+ SILC_LOG_DEBUG(("Client by hash"));
- SILC_LOG_DEBUG(("Finding client by Client ID"));
+ silc_hash_make(md5hash, nickname, strlen(nickname), hash);
- if (!list)
+ if (!silc_idcache_find_by_id(id_list->clients, SILC_ID_CACHE_ANY,
+ SILC_ID_CLIENT, &list))
return NULL;
- first = entry = list;
- if (entry && !SILC_ID_CLIENT_COMPARE(entry->id, id)) {
- SILC_LOG_DEBUG(("Found"));
- return entry;
+ if (!silc_idcache_list_first(list, &id_cache)) {
+ silc_idcache_list_free(list);
+ return NULL;
}
- entry = entry->next;
- while(entry != first) {
- if (entry && !SILC_ID_CLIENT_COMPARE(entry->id, id)) {
- SILC_LOG_DEBUG(("Found"));
- return entry;
- }
+ while (id_cache) {
+ client = (SilcClientEntry)id_cache->context;
+
+ if (client && !SILC_ID_COMPARE_HASH(client->id, hash))
+ break;
- entry = entry->next;
+ id_cache = NULL;
+ client = NULL;
+
+ if (!silc_idcache_list_next(list, &id_cache))
+ break;
}
+
+ silc_idcache_list_free(list);
+
+ if (ret_entry)
+ *ret_entry = id_cache;
- return NULL;
+ SILC_LOG_DEBUG(("Found"));
+
+ return client;
}
-/* Adds new channel to the list. */
+/* Finds client by Client ID */
-void silc_idlist_add_channel(SilcChannelList **list,
- char *channel_name, int mode,
- SilcChannelID *id, SilcServerList *router,
- SilcCipher channel_key,
- SilcChannelList **new_idlist)
+SilcClientEntry
+silc_idlist_find_client_by_id(SilcIDList id_list, SilcClientID *id,
+ SilcIDCacheEntry *ret_entry)
{
- SilcChannelList *last, *idlist;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcClientEntry client;
- SILC_LOG_DEBUG(("Adding new channel to id list"));
+ if (!id)
+ return NULL;
- idlist = silc_calloc(1, sizeof(*idlist));
- if (idlist == NULL) {
- SILC_LOG_ERROR(("Could not allocate new channel list object"));
- return;
- }
+ SILC_LOG_DEBUG(("Client ID (%s)",
+ silc_id_render(id, SILC_ID_CLIENT)));
- /* Set the pointers */
- idlist->channel_name = channel_name;
- idlist->mode = mode;
- idlist->id = id;
- idlist->router = router;
- idlist->channel_key = channel_key;
- idlist->next = idlist;
- idlist->prev = idlist;
-
- /* First on the list? */
- if (!*list) {
- *list = idlist;
- if (new_idlist)
- *new_idlist = idlist;
- return;
- }
+ if (!silc_idcache_find_by_id_one(id_list->clients, (void *)id,
+ SILC_ID_CLIENT, &id_cache))
+ return NULL;
+
+ client = (SilcClientEntry)id_cache->context;
- /* Add it to the list */
- last = (*list)->prev;
- last->next = idlist;
- (*list)->prev = idlist;
- idlist->next = (*list);
- idlist->prev = last;
+ if (ret_entry)
+ *ret_entry = id_cache;
- if (new_idlist)
- *new_idlist = idlist;
+ SILC_LOG_DEBUG(("Found"));
+
+ return client;
}
-SilcChannelList *
-silc_idlist_find_channel_by_id(SilcChannelList *list, SilcChannelID *id)
+/* Replaces old Client ID with new one */
+
+SilcClientEntry
+silc_idlist_replace_client_id(SilcIDList id_list, SilcClientID *old_id,
+ SilcClientID *new_id)
{
- SilcChannelList *first, *entry;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcClientEntry client;
- SILC_LOG_DEBUG(("Finding channel by Channel ID"));
+ if (!old_id || !new_id)
+ return NULL;
- if (!list)
+ SILC_LOG_DEBUG(("Replacing Client ID"));
+
+ if (!silc_idcache_find_by_id_one(id_list->clients, (void *)old_id,
+ SILC_ID_CLIENT, &id_cache))
return NULL;
- first = entry = list;
- if (entry && !SILC_ID_CHANNEL_COMPARE(entry->id, id)) {
- SILC_LOG_DEBUG(("Found"));
- return entry;
+ client = (SilcClientEntry)id_cache->context;
+ silc_free(client->id);
+ client->id = new_id;
+ id_cache->id = (void *)new_id;
+
+ /* If the old ID Cache data was the hash value of the old Client 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));
+ memcpy(id_cache->data, new_id->hash, sizeof(new_id->hash));
+ silc_idcache_sort_by_data(id_list->clients);
}
- entry = entry->next;
- while(entry != first) {
- if (entry && !SILC_ID_CHANNEL_COMPARE(entry->id, id)) {
- SILC_LOG_DEBUG(("Found"));
- return entry;
- }
+ SILC_LOG_DEBUG(("Replaced"));
+
+ return client;
+}
+
+
+/******************************************************************************
- entry = entry->next;
+ Channel entry functions
+
+******************************************************************************/
+
+/* Add new channel entry. This add the new channel entry to the ID cache
+ system and returns the allocated entry or NULL on error. */
+
+SilcChannelEntry
+silc_idlist_add_channel(SilcIDList id_list, char *channel_name, int mode,
+ SilcChannelID *id, SilcServerEntry router,
+ SilcCipher channel_key, char *hmac)
+{
+ SilcChannelEntry channel;
+
+ channel = silc_calloc(1, sizeof(*channel));
+ channel->channel_name = channel_name;
+ channel->mode = mode;
+ channel->id = id;
+ channel->router = router;
+ channel->channel_key = channel_key;
+ channel->hmac = hmac ? strdup(hmac) : strdup("hmac-sha1-96");
+ silc_list_init(channel->user_list, struct SilcChannelClientEntryStruct,
+ channel_list);
+
+ if (!silc_idcache_add(id_list->channels, channel->channel_name,
+ SILC_ID_CHANNEL, (void *)channel->id,
+ (void *)channel, TRUE)) {
+ silc_free(channel);
+ return NULL;
}
- return NULL;
+ return channel;
}
/* Free channel entry. This free's everything. */
-void silc_idlist_del_channel(SilcChannelList **list, SilcChannelList *entry)
+int silc_idlist_del_channel(SilcIDList id_list, SilcChannelEntry entry)
{
if (entry) {
+ SilcChannelClientEntry chl;
+
+ /* Remove from cache */
+ if (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)
silc_free(entry->channel_name);
if (entry->id)
memset(entry->key, 0, entry->key_len / 8);
silc_free(entry->key);
}
- memset(entry->iv, 0, sizeof(entry->iv));
-
- if (entry->user_list_count)
- silc_free(entry->user_list);
-
- /* Last one in list? */
- if (*list == entry && entry->next == entry) {
- *list = NULL;
- silc_free(entry);
- return;
- }
- /* At the start of list? */
- if (*list == entry && entry->next != entry) {
- *list = entry->next;
- entry->next->prev = entry->prev;
- entry->prev->next = *list;
- silc_free(entry);
- return;
+ /* Free all data, free also any reference from the client's channel
+ list since they share the same memory. */
+ silc_list_start(entry->user_list);
+ while ((chl = silc_list_get(entry->user_list)) != SILC_LIST_END) {
+ silc_list_del(chl->client->channels, chl);
+ silc_list_del(entry->user_list, chl);
+ silc_free(chl);
}
- /* Remove from list */
- entry->prev->next = entry->next;
- entry->next->prev = entry->prev;
+ memset(entry, 'F', sizeof(*entry));
silc_free(entry);
- return;
+ return TRUE;
}
+
+ return FALSE;
+}
+
+/* Finds channel by channel name. Channel names are unique and they
+ are not case-sensitive. */
+
+SilcChannelEntry
+silc_idlist_find_channel_by_name(SilcIDList id_list, char *name,
+ SilcIDCacheEntry *ret_entry)
+{
+ SilcIDCacheList list = NULL;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcChannelEntry channel;
+
+ SILC_LOG_DEBUG(("Channel by name"));
+
+ if (!silc_idcache_find_by_data_loose(id_list->channels, name, &list))
+ return NULL;
+
+ if (!silc_idcache_list_first(list, &id_cache)) {
+ silc_idcache_list_free(list);
+ return NULL;
+ }
+
+ channel = (SilcChannelEntry)id_cache->context;
+
+ if (ret_entry)
+ *ret_entry = id_cache;
+
+ silc_idcache_list_free(list);
+
+ SILC_LOG_DEBUG(("Found"));
+
+ return channel;
+}
+
+/* Finds channel by Channel ID. */
+
+SilcChannelEntry
+silc_idlist_find_channel_by_id(SilcIDList id_list, SilcChannelID *id,
+ SilcIDCacheEntry *ret_entry)
+{
+ SilcIDCacheEntry id_cache = NULL;
+ SilcChannelEntry channel;
+
+ if (!id)
+ return NULL;
+
+ 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))
+ return NULL;
+
+ channel = (SilcChannelEntry)id_cache->context;
+
+ 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