#include "serverincludes.h"
#include "idlist.h"
+#include "server_internal.h"
/******************************************************************************
silc_hash_free(idata->hash);
if (idata->public_key)
silc_pkcs_public_key_free(idata->public_key);
+
+ idata->send_key = NULL;
+ idata->receive_key = NULL;
+ idata->rekey = NULL;
+ idata->hmac_send = NULL;
+ idata->hmac_receive = NULL;
+ idata->hash = NULL;
+ idata->public_key = NULL;
}
/* Purges ID cache */
{
SilcIDListPurge i = (SilcIDListPurge)context;
- SILC_LOG_DEBUG(("Start"));
+ SILC_LOG_DEBUG(("Purging cache"));
silc_idcache_purge(i->cache);
silc_schedule_task_add(i->schedule, 0,
server = (SilcServerEntry)id_cache->context;
- if (ret_entry)
- *ret_entry = id_cache;
-
if (server && registered &&
!(server->data.status & SILC_IDLIST_STATUS_REGISTERED))
return NULL;
+ if (ret_entry)
+ *ret_entry = id_cache;
+
SILC_LOG_DEBUG(("Found"));
return server;
server = (SilcServerEntry)id_cache->context;
- if (ret_entry)
- *ret_entry = id_cache;
-
if (server && registered &&
!(server->data.status & SILC_IDLIST_STATUS_REGISTERED))
return NULL;
+ if (ret_entry)
+ *ret_entry = id_cache;
+
SILC_LOG_DEBUG(("Found"));
return server;
silc_idcache_list_free(list);
- if (ret_entry)
- *ret_entry = id_cache;
-
if (server && registered &&
!(server->data.status & SILC_IDLIST_STATUS_REGISTERED))
return NULL;
+ if (ret_entry)
+ *ret_entry = id_cache;
+
SILC_LOG_DEBUG(("Found"));
return server;
int silc_idlist_del_server(SilcIDList id_list, SilcServerEntry entry)
{
- SILC_LOG_DEBUG(("Start"));
-
if (entry) {
/* Remove from cache */
- if (entry->id)
- if (!silc_idcache_del_by_id(id_list->servers, (void *)entry->id))
- return FALSE;
+ if (!silc_idcache_del_by_context(id_list->servers, entry))
+ return FALSE;
+
+ SILC_LOG_DEBUG(("Deleting server %s", entry->server_name ?
+ entry->server_name : ""));
/* Free data */
silc_free(entry->server_name);
silc_free(entry->id);
+ silc_free(entry->server_info);
memset(entry, 'F', sizeof(*entry));
silc_free(entry);
if (entry) {
/* Remove from cache */
- if (entry->id)
- if (!silc_idcache_del_by_context(id_list->clients, entry))
- return FALSE;
+ if (!silc_idcache_del_by_context(id_list->clients, entry))
+ return FALSE;
+
+ assert(!silc_hash_table_count(entry->channels));
/* Free data */
silc_free(entry->nickname);
+ silc_free(entry->servername);
silc_free(entry->username);
silc_free(entry->userinfo);
silc_free(entry->id);
SilcIDCacheEntry id_cache = NULL;
unsigned char hash[32];
SilcClientID client_id;
+ char nick[128 + 1];
SILC_LOG_DEBUG(("Start"));
- silc_hash_make(md5hash, nickname, strlen(nickname), hash);
+ memset(nick, 0, sizeof(nick));
+ silc_to_lower(nickname, nick, sizeof(nick) - 1);
+ silc_hash_make(md5hash, nick, strlen(nick), hash);
/* 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
client = (SilcClientEntry)id_cache->context;
- if (ret_entry)
- *ret_entry = id_cache;
-
if (client && registered &&
!(client->data.status & SILC_IDLIST_STATUS_REGISTERED))
return NULL;
+ if (ret_entry)
+ *ret_entry = id_cache;
+
SILC_LOG_DEBUG(("Found"));
return client;
/* Replaces old Client ID with new one */
SilcClientEntry
-silc_idlist_replace_client_id(SilcIDList id_list, SilcClientID *old_id,
+silc_idlist_replace_client_id(SilcServer server,
+ SilcIDList id_list, SilcClientID *old_id,
SilcClientID *new_id, const char *nickname)
{
SilcIDCacheEntry id_cache = NULL;
if (!silc_idcache_del_by_context(id_list->clients, client))
return NULL;
+ /* Check if anyone is watching old nickname */
+ if (server->server_type == SILC_ROUTER)
+ silc_server_check_watcher_list(server, client, nickname,
+ SILC_NOTIFY_TYPE_NICK_CHANGE);
+
silc_free(client->id);
silc_free(client->nickname);
client->id = new_id;
client->nickname = nickname ? strdup(nickname) : NULL;
+ /* Check if anyone is watching new nickname */
+ if (server->server_type == SILC_ROUTER)
+ silc_server_check_watcher_list(server, client, nickname,
+ SILC_NOTIFY_TYPE_NICK_CHANGE);
+
if (!silc_idcache_add(id_list->clients, client->nickname, client->id,
client, 0, NULL))
return NULL;
client = (SilcClientEntry)entry->context;
if (client) {
+ assert(!silc_hash_table_count(client->channels));
silc_free(client->nickname);
silc_free(client->username);
silc_free(client->userinfo);
silc_free(client->id);
silc_hash_table_free(client->channels);
- memset(client, 'F', sizeof(*client));
+ memset(client, 'A', sizeof(*client));
silc_free(client);
}
}
{
SilcChannelEntry channel;
- SILC_LOG_DEBUG(("Adding new channel entry"));
+ SILC_LOG_DEBUG(("Adding new channel %s", channel_name));
channel = silc_calloc(1, sizeof(*channel));
channel->channel_name = channel_name;
channel->router = router;
channel->channel_key = channel_key;
channel->hmac = hmac;
- channel->created = time(0);
+ channel->created = channel->updated = time(0);
if (!channel->hmac)
if (!silc_hmac_alloc(SILC_DEFAULT_HMAC, NULL, &channel->hmac)) {
silc_free(channel);
SilcChannelClientEntry chl = (SilcChannelClientEntry)context;
SILC_LOG_DEBUG(("Removing client %s from channel %s",
- chl->client->nickname, chl->channel->channel_name));
+ chl->client->nickname ? chl->client->nickname :
+ (unsigned char *)"", chl->channel->channel_name));
/* Remove the context from the client's channel hash table as that
table and channel's user_list hash table share this same context. */
int silc_idlist_del_channel(SilcIDList id_list, SilcChannelEntry entry)
{
- SILC_LOG_DEBUG(("Start"));
-
if (entry) {
/* Remove from cache */
- if (entry->id)
- if (!silc_idcache_del_by_id(id_list->channels, (void *)entry->id))
- return FALSE;
+ if (!silc_idcache_del_by_context(id_list->channels, entry))
+ return FALSE;
+
+ SILC_LOG_DEBUG(("Deleting channel %s", entry->channel_name));
/* 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
silc_hmac_free(entry->hmac);
silc_free(entry->hmac_name);
silc_free(entry->rekey);
+ if (entry->founder_key)
+ silc_pkcs_public_key_free(entry->founder_key);
memset(entry, 'F', sizeof(*entry));
silc_free(entry);
SILC_LOG_DEBUG(("Found"));
+ /* Touch channel */
+ ((SilcChannelEntry)id_cache->context)->updated = time(NULL);
+
return id_cache->context;
}
SILC_LOG_DEBUG(("Found"));
+ /* Touch channel */
+ channel->updated = time(NULL);
+
return channel;
}
SILC_LOG_DEBUG(("Replaced"));
+ /* Touch channel */
+ channel->updated = time(NULL);
+
return channel;
}
projects / silc.git / blobdiff