Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2001 - 2008 Pekka Riikonen
+ Copyright (C) 2001 - 2014 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
/* Take all without any further checking */
while ((id_cache = silc_list_get(list))) {
entry = id_cache->context;
+ if (!entry)
+ continue;
if (!get_valid || entry->internal.valid) {
silc_client_ref_client(client, conn, id_cache->context);
silc_dlist_add(clients, id_cache->context);
/* Check multiple cache entries for exact match */
while ((id_cache = silc_list_get(list))) {
entry = id_cache->context;
+ if (!entry)
+ continue;
/* If server was provided, find entries that either have no server
set or have the same server. Ignore those that have different
client_entry->server, sizeof(client_entry->server));
if (nickname && client->internal->params->full_nicknames)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- nickname);
+ "%s", nickname);
else if (nickname)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- parsed);
+ "%s", parsed);
silc_parse_userfqdn(username, client_entry->username,
sizeof(client_entry->username),
client_entry->server, sizeof(client_entry->server));
if (client->internal->params->full_nicknames)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- nickname);
+ "%s", nickname);
else
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- parsed);
+ "%s", parsed);
/* Normalize nickname */
nick = silc_identifier_check(parsed, strlen(parsed),
if (client_entry->internal.hmac_receive)
silc_hmac_free(client_entry->internal.hmac_receive);
silc_client_ftp_session_free_client(client, client_entry);
+ if (client_entry->internal.op)
+ silc_async_abort(client_entry->internal.op, NULL, NULL);
+ client_entry->internal.op = NULL;
if (client_entry->internal.ke)
silc_client_abort_key_agreement(client, conn, client_entry);
silc_atomic_uninit32(&client_entry->internal.deleted);
return FALSE;
}
+ /* Abort ongoing operation */
+ if (client_entry->internal.op) {
+ SILC_LOG_DEBUG(("Aborting ongoing operation %p",
+ client_entry->internal.op));
+ silc_async_abort(client_entry->internal.op, NULL, NULL);
+ client_entry->internal.op = NULL;
+ }
+
silc_client_unref_client(client, conn, client_entry);
return TRUE;
}
return NULL;
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- cp);
+ "%s", cp);
silc_free(cp);
}
void silc_client_unref_server(SilcClient client, SilcClientConnection conn,
SilcServerEntry server_entry)
{
- SilcBool ret;
SilcIDCacheEntry id_cache;
char *namec;
if (silc_idcache_find_by_context(conn->internal->server_cache, server_entry,
&id_cache)) {
namec = id_cache->name;
- ret = silc_idcache_del_by_context(conn->internal->server_cache,
- server_entry, NULL);
+ silc_idcache_del_by_context(conn->internal->server_cache,
+ server_entry, NULL);
silc_free(namec);
}
silc_mutex_unlock(conn->internal->lock);