data->receive_key = idata->receive_key;
data->rekey = idata->rekey;
data->hash = idata->hash;
- data->hmac = idata->hmac;
+ data->hmac_send = idata->hmac_send;
+ data->hmac_receive = idata->hmac_receive;
data->public_key = idata->public_key;
data->last_receive = idata->last_receive;
data->last_sent = idata->last_sent;
}
silc_free(idata->rekey);
}
- if (idata->hmac)
- silc_hmac_free(idata->hmac);
+ if (idata->hmac_send) /* Same as idata->hmac_receive */
+ silc_hmac_free(idata->hmac_send);
if (idata->public_key)
silc_pkcs_public_key_free(idata->public_key);
}
server->connection = connection;
if (!silc_idcache_add(id_list->servers, server->server_name,
- server->server_name ? strlen(server->server_name) : 0,
- SILC_ID_SERVER, (void *)server->id,
- (void *)server, TRUE, FALSE)) {
+ (void *)server->id, (void *)server, FALSE)) {
silc_free(server);
return NULL;
}
silc_id_render(id, SILC_ID_SERVER)));
if (!silc_idcache_find_by_id_one(id_list->servers, (void *)id,
- SILC_ID_SERVER, &id_cache))
+ &id_cache))
return NULL;
server = (SilcServerEntry)id_cache->context;
if (ret_entry)
*ret_entry = id_cache;
+ SILC_LOG_DEBUG(("Found"));
+
return server;
}
SILC_LOG_DEBUG(("Server by name `%s'", name));
- if (!silc_idcache_find_by_data_one(id_list->servers, name, &id_cache))
+ if (!silc_idcache_find_by_name_one(id_list->servers, name, &id_cache))
return NULL;
server = (SilcServerEntry)id_cache->context;
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))
+ if (!silc_idcache_get_all(id_list->servers, &list))
return NULL;
if (!silc_idcache_list_first(list, &id_cache)) {
server = (SilcServerEntry)id_cache->context;
sock = (SilcSocketConnection)server->connection;
- if (sock && ((sock->hostname && !strcmp(sock->hostname, hostname)) ||
- (sock->ip && !strcmp(sock->ip, hostname)))
+ if (sock && ((sock->hostname && !strcasecmp(sock->hostname, hostname)) ||
+ (sock->ip && !strcasecmp(sock->ip, hostname)))
&& sock->port == port)
break;
SILC_LOG_DEBUG(("Replacing Server ID"));
if (!silc_idcache_find_by_id_one(id_list->servers, (void *)old_id,
- SILC_ID_SERVER, &id_cache))
+ &id_cache))
return NULL;
server = (SilcServerEntry)id_cache->context;
+
+ /* Remove the old entry and add a new one */
+
+ silc_idcache_del_by_id(id_list->servers, (void *)server->id);
+
silc_free(server->id);
server->id = new_id;
- id_cache->id = (void *)new_id;
+
+ silc_idcache_add(id_list->servers, server->server_name, server->id,
+ server, FALSE);
SILC_LOG_DEBUG(("Found"));
if (entry) {
/* Remove from cache */
if (entry->id)
- if (!silc_idcache_del_by_id(id_list->servers, SILC_ID_SERVER,
- (void *)entry->id))
+ if (!silc_idcache_del_by_id(id_list->servers, (void *)entry->id))
return FALSE;
/* Free data */
to be directly connected local client and `router' must be NULL. */
SilcClientEntry
-silc_idlist_add_client(SilcIDList id_list, unsigned char *nickname,
- uint32 nickname_len, char *username,
+silc_idlist_add_client(SilcIDList id_list, char *nickname, char *username,
char *userinfo, SilcClientID *id,
SilcServerEntry router, void *connection)
{
client->id = id;
client->router = router;
client->connection = connection;
- silc_list_init(client->channels, struct SilcChannelClientEntryStruct,
- client_list);
+ client->channels = silc_hash_table_alloc(3, silc_hash_ptr, NULL,
+ NULL, NULL, NULL, NULL, TRUE);
- if (!silc_idcache_add(id_list->clients, nickname, nickname_len,
- SILC_ID_CLIENT, (void *)client->id,
- (void *)client, TRUE, FALSE)) {
+ if (!silc_idcache_add(id_list->clients, nickname, (void *)client->id,
+ (void *)client, FALSE)) {
+ silc_hash_table_free(client->channels);
silc_free(client);
return NULL;
}
if (entry) {
/* Remove from cache */
if (entry->id)
- if (!silc_idcache_del_by_id(id_list->clients, SILC_ID_CLIENT,
- (void *)entry->id))
+ if (!silc_idcache_del_by_context(id_list->clients, entry))
return FALSE;
/* Free data */
SILC_LOG_DEBUG(("Start"));
- if (!silc_idcache_find_by_data(id_list->clients, nickname, &list))
+ if (!silc_idcache_find_by_name(id_list->clients, nickname, &list))
return FALSE;
*clients = silc_realloc(*clients,
*clients_count += i;
+ SILC_LOG_DEBUG(("Found %d clients", *clients_count));
+
return TRUE;
}
-/* Returns all clients matching requested nickname. Number of clients is
- returned to `clients_count'. Caller must free the returned table. */
-/* XXX This actually checks the data, which can be hash of the nickname
- but is not if the client is local client. Global client on global
- list may have hash. Thus, this is not fully reliable function.
- Instead this should probably check the hash from the list of client ID's. */
+/* Returns all clients matching requested nickname hash. Number of clients
+ is returned to `clients_count'. Caller must free the returned table. */
int silc_idlist_get_clients_by_hash(SilcIDList id_list, char *nickname,
SilcHash md5hash,
SilcIDCacheEntry id_cache = NULL;
unsigned char hash[32];
int i;
+ SilcClientID client_id;
SILC_LOG_DEBUG(("Start"));
silc_hash_make(md5hash, nickname, strlen(nickname), hash);
- if (!silc_idcache_find_by_data(id_list->clients, hash, &list))
+ /* As the Client ID is hashed in the ID cache by hashing only the hash
+ from the Client ID, we can do a lookup with only the hash not the
+ other parts of the ID and get all the clients with that hash, ie.
+ with that nickname, as the hash is from the nickname. */
+ memset(&client_id, 0, sizeof(client_id));
+ memcpy(&client_id.hash, hash, sizeof(client_id.hash));
+ if (!silc_idcache_find_by_id(id_list->clients, &client_id, &list))
return FALSE;
*clients = silc_realloc(*clients,
*clients_count += i;
- return TRUE;
-}
-
-/* Finds client by nickname hash. */
-
-SilcClientEntry
-silc_idlist_find_client_by_hash(SilcIDList id_list, char *nickname,
- SilcHash md5hash, SilcIDCacheEntry *ret_entry)
-{
- SilcIDCacheList list = NULL;
- SilcIDCacheEntry id_cache = NULL;
- SilcClientEntry client = NULL;
- unsigned char hash[32];
-
- SILC_LOG_DEBUG(("Client by hash"));
-
- silc_hash_make(md5hash, nickname, strlen(nickname), hash);
-
- if (!silc_idcache_find_by_id(id_list->clients, SILC_ID_CACHE_ANY,
- SILC_ID_CLIENT, &list))
- return NULL;
-
- if (!silc_idcache_list_first(list, &id_cache)) {
- silc_idcache_list_free(list);
- return NULL;
- }
-
- while (id_cache) {
- client = (SilcClientEntry)id_cache->context;
-
- if (client && !SILC_ID_COMPARE_HASH(client->id, hash))
- break;
+ SILC_LOG_DEBUG(("Found %d clients", *clients_count));
- 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;
-
- SILC_LOG_DEBUG(("Found"));
-
- return client;
+ return TRUE;
}
/* Finds client by Client 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))
+ /* Do extended search since the normal ID comparison function for
+ Client ID's compares only the hash from the Client ID and not the
+ entire ID. The silc_hash_client_id_compare compares the entire
+ Client ID as we want to find one specific Client ID. */
+ if (!silc_idcache_find_by_id_one_ext(id_list->clients, (void *)id,
+ NULL, NULL,
+ silc_hash_client_id_compare, NULL,
+ &id_cache))
return NULL;
client = (SilcClientEntry)id_cache->context;
SILC_LOG_DEBUG(("Replacing Client ID"));
- if (!silc_idcache_find_by_id_one(id_list->clients, (void *)old_id,
- SILC_ID_CLIENT, &id_cache))
+ /* Do extended search since the normal ID comparison function for
+ Client ID's compares only the hash from the Client ID and not the
+ entire ID. The silc_hash_client_id_compare compares the entire
+ Client ID as we want to find one specific Client ID. */
+ if (!silc_idcache_find_by_id_one_ext(id_list->clients, (void *)old_id,
+ NULL, NULL,
+ silc_hash_client_id_compare, NULL,
+ &id_cache))
return NULL;
client = (SilcClientEntry)id_cache->context;
+
+ /* Remove the old entry and add a new one */
+
+ silc_idcache_del_by_context(id_list->clients, client);
+
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);
- }
+
+ silc_idcache_add(id_list->clients, client->nickname, client->id,
+ client, FALSE);
SILC_LOG_DEBUG(("Replaced"));
return NULL;
}
- silc_list_init(channel->user_list, struct SilcChannelClientEntryStruct,
- channel_list);
+ channel->user_list = silc_hash_table_alloc(3, silc_hash_ptr, NULL, NULL,
+ NULL, NULL, NULL, TRUE);
if (!silc_idcache_add(id_list->channels, channel->channel_name,
- channel->channel_name ? strlen(channel->channel_name) :
- 0, SILC_ID_CHANNEL,
- (void *)channel->id, (void *)channel, TRUE, FALSE)) {
+ (void *)channel->id, (void *)channel, FALSE)) {
+ silc_hmac_free(channel->hmac);
+ silc_hash_table_free(channel->user_list);
silc_free(channel);
return NULL;
}
return channel;
}
+/* Foreach callbcak to free all users from the channel when deleting a
+ channel entry. */
+
+static void silc_idlist_del_channel_foreach(void *key, void *context,
+ void *user_context)
+{
+ SilcChannelClientEntry chl = (SilcChannelClientEntry)context;
+
+ /* Remove the context from the client's channel hash table as that
+ table and channel's user_list hash table share this same context. */
+ silc_hash_table_del(chl->client->channels, chl->channel);
+ silc_free(chl);
+}
+
/* Free channel entry. This free's everything. */
int silc_idlist_del_channel(SilcIDList id_list, SilcChannelEntry entry)
SILC_LOG_DEBUG(("Start"));
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))
+ if (!silc_idcache_del_by_id(id_list->channels, (void *)entry->id))
return FALSE;
/* Free data */
if (entry->rekey)
silc_free(entry->rekey);
- /* 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);
- }
+ /* Free all client entrys from the users list. The silc_hash_table_free
+ will free all the entries so they are not freed at the foreach
+ callback. */
+ silc_hash_table_foreach(entry->user_list, silc_idlist_del_channel_foreach,
+ NULL);
+ silc_hash_table_free(entry->user_list);
memset(entry, 'F', sizeof(*entry));
silc_free(entry);
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))
+ if (!silc_idcache_find_by_name_one(id_list->channels, name, &id_cache))
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;
+ return id_cache->context;
}
/* Finds channel by Channel 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 (!silc_idcache_find_by_id_one(id_list->channels, (void *)id, &id_cache))
return NULL;
channel = (SilcChannelEntry)id_cache->context;
SILC_LOG_DEBUG(("Replacing Channel ID"));
if (!silc_idcache_find_by_id_one(id_list->channels, (void *)old_id,
- SILC_ID_CHANNEL, &id_cache))
+ &id_cache))
return NULL;
channel = (SilcChannelEntry)id_cache->context;
+
+ /* Remove the old entry and add a new one */
+
+ silc_idcache_del_by_id(id_list->channels, (void *)channel->id);
+
silc_free(channel->id);
channel->id = new_id;
- id_cache->id = (void *)new_id;
+
+ silc_idcache_add(id_list->channels, channel->channel_name, channel->id,
+ channel, FALSE);
SILC_LOG_DEBUG(("Replaced"));
{
SilcIDCacheList list = NULL;
SilcIDCacheEntry id_cache = NULL;
- SilcChannelEntry *channels;
- int i;
+ SilcChannelEntry *channels = NULL;
+ int i = 0;
SILC_LOG_DEBUG(("Start"));
- if (!silc_idcache_find_by_id(id_list->channels, channel_id ? channel_id :
- SILC_ID_CACHE_ANY, SILC_ID_CHANNEL, &list))
- return NULL;
+ if (!channel_id) {
+ if (!silc_idcache_get_all(id_list->channels, &list))
+ return NULL;
- channels = silc_calloc(silc_idcache_list_count(list), sizeof(*channels));
+ channels = silc_calloc(silc_idcache_list_count(list), sizeof(*channels));
+
+ i = 0;
+ silc_idcache_list_first(list, &id_cache);
+ channels[i++] = (SilcChannelEntry)id_cache->context;
+
+ while (silc_idcache_list_next(list, &id_cache))
+ channels[i++] = (SilcChannelEntry)id_cache->context;
+
+ silc_idcache_list_free(list);
+ } else {
+ if (!silc_idcache_find_by_id_one(id_list->channels, channel_id, &id_cache))
+ return NULL;
- i = 0;
- silc_idcache_list_first(list, &id_cache);
- channels[i++] = (SilcChannelEntry)id_cache->context;
+ i = 1;
+ channels = silc_calloc(1, sizeof(*channels));
+ channels[0] = (SilcChannelEntry)id_cache->context;
+ }
- while (silc_idcache_list_next(list, &id_cache))
- channels[i++] = (SilcChannelEntry)id_cache->context;
-
- silc_idcache_list_free(list);
-
if (channels_count)
*channels_count = i;
projects / silc.git / blobdiff