data->psn_receive = idata->psn_receive;
data->hash = idata->hash;
data->public_key = idata->public_key;
+ memcpy(data->fingerprint, idata->fingerprint, sizeof(data->fingerprint));
data->rekey = idata->rekey;
data->last_receive = idata->last_receive;
data->last_sent = idata->last_sent;
}
silc_free(idata->rekey);
}
- if (idata->hmac_send) /* Same as idata->hmac_receive */
+ if (idata->hmac_send)
silc_hmac_free(idata->hmac_send);
+ if (idata->hmac_receive)
+ silc_hmac_free(idata->hmac_receive);
+ if (idata->hash)
+ silc_hash_free(idata->hash);
if (idata->public_key)
silc_pkcs_public_key_free(idata->public_key);
}
silc_idcache_purge(i->cache);
silc_schedule_task_add(i->schedule, 0,
silc_idlist_purge,
- (void *)i, 600, 0,
+ (void *)i, i->timeout, 0,
SILC_TASK_TIMEOUT, SILC_TASK_PRI_LOW);
}
server->connection = connection;
if (!silc_idcache_add(id_list->servers, server->server_name,
- (void *)server->id, (void *)server, FALSE)) {
+ (void *)server->id, (void *)server, 0, NULL)) {
silc_free(server);
return NULL;
}
server->id = new_id;
silc_idcache_add(id_list->servers, server->server_name, server->id,
- server, FALSE);
+ server, 0, NULL);
SILC_LOG_DEBUG(("Found"));
SilcClientEntry
silc_idlist_add_client(SilcIDList id_list, char *nickname, char *username,
char *userinfo, SilcClientID *id,
- SilcServerEntry router, void *connection)
+ SilcServerEntry router, void *connection,
+ int expire)
{
SilcClientEntry client;
NULL, NULL, NULL, NULL, TRUE);
if (!silc_idcache_add(id_list->clients, nickname, (void *)client->id,
- (void *)client, FALSE)) {
+ (void *)client, expire, NULL)) {
silc_hash_table_free(client->channels);
silc_free(client);
return NULL;
silc_free(entry->username);
silc_free(entry->userinfo);
silc_free(entry->id);
+ silc_hash_table_free(entry->channels);
memset(entry, 'F', sizeof(*entry));
silc_free(entry);
silc_free(client->id);
client->id = new_id;
- silc_idcache_add(id_list->clients, NULL, client->id, client, FALSE);
+ silc_idcache_add(id_list->clients, NULL, client->id, client, 0, NULL);
SILC_LOG_DEBUG(("Replaced"));
{
SilcClientEntry client;
- SILC_LOG_DEBUG(("Start"));
-
client = (SilcClientEntry)entry->context;
if (client) {
- if (client->nickname)
- silc_free(client->nickname);
- if (client->username)
- silc_free(client->username);
- if (client->userinfo)
- silc_free(client->userinfo);
- if (client->id)
- silc_free(client->id);
+ 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));
silc_free(client);
SilcChannelEntry
silc_idlist_add_channel(SilcIDList id_list, char *channel_name, int mode,
SilcChannelID *id, SilcServerEntry router,
- SilcCipher channel_key, SilcHmac hmac)
+ SilcCipher channel_key, SilcHmac hmac,
+ int expire)
{
SilcChannelEntry channel;
NULL, NULL, NULL, TRUE);
if (!silc_idcache_add(id_list->channels, channel->channel_name,
- (void *)channel->id, (void *)channel, FALSE)) {
+ (void *)channel->id, (void *)channel, expire, NULL)) {
silc_hmac_free(channel->hmac);
silc_hash_table_free(channel->user_list);
silc_free(channel);
silc_free(entry->key);
}
silc_free(entry->cipher);
+ if (entry->hmac)
+ silc_hmac_free(entry->hmac);
silc_free(entry->hmac_name);
silc_free(entry->rekey);
channel->id = new_id;
silc_idcache_add(id_list->channels, channel->channel_name, channel->id,
- channel, FALSE);
+ channel, 0, NULL);
SILC_LOG_DEBUG(("Replaced"));