- if (!silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)remote_id,
- NULL, NULL,
- silc_hash_client_id_compare, NULL,
- &id_cache) ||
- ((SilcClientEntry)id_cache->context)->nickname == NULL) {
-
- if (id_cache && id_cache->context) {
- remote_client = (SilcClientEntry)id_cache->context;
+ remote_client = silc_client_get_client_by_id(client, conn, remote_id);
+ if (!remote_client || !remote_client->nickname) {
+ if (remote_client) {