Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2001 - 2006 Pekka Riikonen
+ Copyright (C) 2001 - 2007 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
SilcDList clients;
SilcGetClientCallback completion;
void *context;
+ SilcClientEntry client_entry;
} *SilcClientGetClientInternal;
/* Resolving command callback */
if (error != SILC_STATUS_OK) {
SILC_LOG_DEBUG(("Resolving failed: %s", silc_get_status_message(error)));
+
+ if (i->client_entry) {
+ i->client_entry->internal.resolve_cmd_ident = 0;
+ silc_client_unref_client(client, conn, i->client_entry);
+ }
+
if (i->completion)
i->completion(client, conn, error, NULL, i->context);
goto out;
/* Deliver the clients to the caller */
if (i->completion) {
SILC_LOG_DEBUG(("Resolved %d clients", silc_dlist_count(i->clients)));
+
+ if (i->client_entry) {
+ i->client_entry->internal.resolve_cmd_ident = 0;
+ silc_client_unref_client(client, conn, i->client_entry);
+ }
+
silc_dlist_start(i->clients);
i->completion(client, conn, SILC_STATUS_OK, i->clients, i->context);
}
if (!cmd_ident && completion)
completion(client, conn, SILC_STATUS_ERR_RESOURCE_LIMIT, NULL, context);
- if (client_entry && cmd_ident)
+ if (client_entry && cmd_ident) {
client_entry->internal.resolve_cmd_ident = cmd_ident;
+ i->client_entry = client_entry;
+ } else {
+ silc_client_unref_client(client, conn, client_entry);
+ }
- silc_client_unref_client(client, conn, client_entry);
silc_buffer_free(idp);
return cmd_ident;
if (!client_entry)
return NULL;
+ silc_rwlock_alloc(&client_entry->internal.lock);
silc_atomic_init8(&client_entry->internal.refcnt, 0);
client_entry->id = *id;
- client_entry->internal.valid = TRUE;
client_entry->mode = mode;
client_entry->realname = userinfo ? strdup(userinfo) : NULL;
silc_parse_userfqdn(nickname, client_entry->nickname,
}
}
- /* Format the nickname */
- silc_client_nickname_format(client, conn, client_entry, FALSE);
-
silc_mutex_lock(conn->internal->lock);
/* Add client to cache, the normalized nickname is saved to cache */
silc_mutex_unlock(conn->internal->lock);
silc_client_ref_client(client, conn, client_entry);
+ /* Format the nickname */
+ silc_client_nickname_format(client, conn, client_entry, FALSE);
+
+ if (client_entry->nickname[0])
+ client_entry->internal.valid = TRUE;
+
SILC_LOG_DEBUG(("Added %p", client_entry));
return client_entry;
}
-/* Updates the `client_entry' with the new information sent as argument. */
+/* Updates the `client_entry' with the new information sent as argument.
+ This handles entry locking internally. */
void silc_client_update_client(SilcClient client,
SilcClientConnection conn,
SILC_LOG_DEBUG(("Update client entry"));
+ silc_rwlock_wrlock(client_entry->internal.lock);
+
if (!client_entry->realname && userinfo)
client_entry->realname = strdup(userinfo);
if ((!client_entry->username[0] || !client_entry->hostname[0]) && username)
nick = silc_identifier_check(client_entry->nickname,
strlen(client_entry->nickname),
SILC_STRING_UTF8, 128, NULL);
- if (!nick)
+ if (!nick) {
+ silc_rwlock_unlock(client_entry->internal.lock);
return;
+ }
/* Format nickname */
silc_client_nickname_format(client, conn, client_entry,
client_entry, NULL, nick, TRUE);
silc_mutex_unlock(conn->internal->lock);
client_entry->nickname_normalized = nick;
+ client_entry->internal.valid = TRUE;
}
client_entry->mode = mode;
+
+ silc_rwlock_unlock(client_entry->internal.lock);
}
-/* Change a client's nickname */
+/* Change a client's nickname. Must be called with `client_entry' locked. */
SilcBool silc_client_change_nickname(SilcClient client,
SilcClientConnection conn,
0, NULL);
}
+ client_entry->internal.valid = TRUE;
return TRUE;
}
silc_client_abort_key_agreement(client, conn, client_entry);
#endif /* 0 */
silc_atomic_uninit8(&client_entry->internal.refcnt);
+ silc_rwlock_free(client_entry->internal.lock);
silc_free(client_entry);
}
return ret;
}
+/* Internal routine used to find client by ID and if not found this creates
+ new client entry and returns it. */
+
+SilcClientEntry silc_client_get_client(SilcClient client,
+ SilcClientConnection conn,
+ SilcClientID *client_id)
+{
+ SilcClientEntry client_entry;
+
+ client_entry = silc_client_get_client_by_id(client, conn, client_id);
+ if (!client_entry) {
+ client_entry = silc_client_add_client(client, conn, NULL, NULL, NULL,
+ client_id, 0);
+ if (!client_entry)
+ return NULL;
+ silc_client_ref_client(client, conn, client_entry);
+ }
+
+ return client_entry;
+}
+
+/* Lock client */
+
+void silc_client_lock_client(SilcClientEntry client_entry)
+{
+ silc_rwlock_rdlock(client_entry->internal.lock);
+}
+
+/* Unlock client */
+
+void silc_client_unlock_client(SilcClientEntry client_entry)
+{
+ silc_rwlock_unlock(client_entry->internal.lock);
+}
+
/* Take reference of client entry */
-void silc_client_ref_client(SilcClient client, SilcClientConnection conn,
- SilcClientEntry client_entry)
+SilcClientEntry silc_client_ref_client(SilcClient client,
+ SilcClientConnection conn,
+ SilcClientEntry client_entry)
{
silc_atomic_add_int8(&client_entry->internal.refcnt, 1);
SILC_LOG_DEBUG(("Client %p refcnt %d->%d", client_entry,
silc_atomic_get_int8(&client_entry->internal.refcnt) - 1,
silc_atomic_get_int8(&client_entry->internal.refcnt)));
+ return client_entry;
}
/* Release reference of client entry */
SilcDList clients;
SilcClientEntry entry, unformatted = NULL;
- SILC_LOG_DEBUG(("Format nickname"));
-
if (!client->internal->params->nickname_format[0])
return client_entry;
if (!client_entry->nickname[0])
return NULL;
+ SILC_LOG_DEBUG(("Format nickname"));
+
/* Get all clients with same nickname. Do not perform the formatting
if there aren't any clients with same nickname unless the application
is forcing us to do so. */
if (!channel)
return NULL;
+ silc_rwlock_alloc(&channel->internal.lock);
silc_atomic_init16(&channel->internal.refcnt, 0);
channel->id = *channel_id;
channel->mode = mode;
SILC_ARGUMENT_PUBLIC_KEY);
silc_client_del_channel_private_keys(client, conn, channel);
silc_atomic_uninit16(&channel->internal.refcnt);
+ silc_rwlock_free(channel->internal.lock);
silc_schedule_task_del_by_context(conn->client->schedule, channel);
silc_free(channel);
}
/* Replaces the channel ID of the `channel' to `new_id'. Returns FALSE
- if the ID could not be changed. */
+ if the ID could not be changed. This handles entry locking internally. */
SilcBool silc_client_replace_channel_id(SilcClient client,
SilcClientConnection conn,
silc_id_render(new_id, SILC_ID_CHANNEL)));
/* Update the ID */
+ silc_rwlock_wrlock(channel->internal.lock);
silc_mutex_lock(conn->internal->lock);
silc_idcache_update_by_context(conn->internal->channel_cache, channel,
new_id, NULL, FALSE);
silc_mutex_unlock(conn->internal->lock);
+ silc_rwlock_unlock(channel->internal.lock);
return ret;
}
+/* Lock channel */
+
+void silc_client_lock_channel(SilcChannelEntry channel_entry)
+{
+ silc_rwlock_rdlock(channel_entry->internal.lock);
+}
+
+/* Unlock client */
+
+void silc_client_unlock_channel(SilcChannelEntry channel_entry)
+{
+ silc_rwlock_unlock(channel_entry->internal.lock);
+}
+
/* Take reference of channel entry */
-void silc_client_ref_channel(SilcClient client, SilcClientConnection conn,
- SilcChannelEntry channel_entry)
+SilcChannelEntry silc_client_ref_channel(SilcClient client,
+ SilcClientConnection conn,
+ SilcChannelEntry channel_entry)
{
silc_atomic_add_int16(&channel_entry->internal.refcnt, 1);
SILC_LOG_DEBUG(("Channel %p refcnt %d->%d", channel_entry,
silc_atomic_get_int16(&channel_entry->internal.refcnt) - 1,
silc_atomic_get_int16(&channel_entry->internal.refcnt)));
+ return channel_entry;
}
/* Release reference of channel entry */
if (!server_entry)
return NULL;
+ silc_rwlock_alloc(&server_entry->internal.lock);
silc_atomic_init8(&server_entry->internal.refcnt, 0);
server_entry->id = *server_id;
if (server_name)
if (server->public_key)
silc_pkcs_public_key_free(server->public_key);
silc_atomic_uninit8(&server->internal.refcnt);
+ silc_rwlock_free(server->internal.lock);
silc_free(server);
return ret;
}
}
+/* Lock server */
+
+void silc_client_lock_server(SilcServerEntry server_entry)
+{
+ silc_rwlock_rdlock(server_entry->internal.lock);
+}
+
+/* Unlock server */
+
+void silc_client_unlock_server(SilcServerEntry server_entry)
+{
+ silc_rwlock_unlock(server_entry->internal.lock);
+}
+
/* Take reference of server entry */
-void silc_client_ref_server(SilcClient client, SilcClientConnection conn,
- SilcServerEntry server_entry)
+SilcServerEntry silc_client_ref_server(SilcClient client,
+ SilcClientConnection conn,
+ SilcServerEntry server_entry)
{
silc_atomic_add_int8(&server_entry->internal.refcnt, 1);
SILC_LOG_DEBUG(("Server %p refcnt %d->%d", server_entry,
silc_atomic_get_int8(&server_entry->internal.refcnt) - 1,
silc_atomic_get_int8(&server_entry->internal.refcnt)));
+ return server_entry;
}
/* Release reference of server entry */