X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient_notify.c;h=a07991736323e7930e1f33c0657609266cffc75c;hp=14b3b591f053c83c7a190fcf3155b3f84fb399a9;hb=017dec75a98209fbef49eb496c2269b0c49e736d;hpb=622dbba14878964ca76301bdf9c8f59f3312fbc7 diff --git a/lib/silcclient/client_notify.c b/lib/silcclient/client_notify.c index 14b3b591..a0799173 100644 --- a/lib/silcclient/client_notify.c +++ b/lib/silcclient/client_notify.c @@ -29,10 +29,11 @@ is required before processing the notify message. This calls again the silc_client_notify_by_server and reprocesses the original notify packet. */ -static void silc_client_notify_by_server_pending(void *context) +static void silc_client_notify_by_server_pending(void *context, void *context2) { SilcPacketContext *p = (SilcPacketContext *)context; silc_client_notify_by_server(p->context, p->sock, p); + silc_socket_free(p->sock); } /* Destructor for the pending command callback */ @@ -53,7 +54,7 @@ static void silc_client_notify_by_server_resolve(SilcClient client, SilcBuffer idp = silc_id_payload_encode(client_id, SILC_ID_CLIENT); p->context = (void *)client; - p->sock = conn->sock; + p->sock = silc_socket_dup(conn->sock); silc_client_send_command(client, conn, SILC_COMMAND_WHOIS, ++conn->cmd_ident, 1, 3, idp->data, idp->len); @@ -78,13 +79,15 @@ void silc_client_notify_by_server(SilcClient client, SilcIDPayload idp; SilcClientID *client_id = NULL; SilcChannelID *channel_id = NULL; + SilcServerID *server_id = NULL; SilcClientEntry client_entry; SilcClientEntry client_entry2; SilcChannelEntry channel; SilcChannelUser chu; + SilcServerEntry server; SilcIDCacheEntry id_cache = NULL; unsigned char *tmp; - unsigned int tmp_len, mode; + uint32 tmp_len, mode; payload = silc_notify_payload_parse(buffer); if (!payload) @@ -120,7 +123,7 @@ void silc_client_notify_by_server(SilcClient client, /* Get the channel entry */ channel = NULL; if (silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) + &id_cache)) channel = (SilcChannelEntry)id_cache->context; /* Get sender Client ID */ @@ -187,7 +190,7 @@ void silc_client_notify_by_server(SilcClient client, /* Get channel entry */ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) + &id_cache)) break; channel = (SilcChannelEntry)id_cache->context; @@ -235,7 +238,7 @@ void silc_client_notify_by_server(SilcClient client, if (!channel_id) goto out; if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) + &id_cache)) break; channel = (SilcChannelEntry)id_cache->context; @@ -280,8 +283,7 @@ void silc_client_notify_by_server(SilcClient client, silc_client_remove_from_channels(client, conn, client_entry); /* Remove from cache */ - silc_idcache_del_by_id(conn->client_cache, SILC_ID_CLIENT, - client_entry->id); + silc_idcache_del_by_context(conn->client_cache, client_entry); /* Get signoff message */ tmp = silc_argument_get_arg_type(args, 2, &tmp_len); @@ -292,16 +294,7 @@ void silc_client_notify_by_server(SilcClient client, client->ops->notify(client, conn, type, client_entry, tmp); /* Free data */ - if (client_entry->nickname) - silc_free(client_entry->nickname); - if (client_entry->server) - silc_free(client_entry->server); - if (client_entry->id) - silc_free(client_entry->id); - if (client_entry->send_key) - silc_cipher_free(client_entry->send_key); - if (client_entry->receive_key) - silc_cipher_free(client_entry->receive_key); + silc_client_del_client_entry(client, client_entry); break; case SILC_NOTIFY_TYPE_TOPIC_SET: @@ -335,7 +328,7 @@ void silc_client_notify_by_server(SilcClient client, if (!channel_id) goto out; if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) + &id_cache)) break; channel = (SilcChannelEntry)id_cache->context; @@ -364,7 +357,7 @@ void silc_client_notify_by_server(SilcClient client, goto out; /* Ignore my ID */ - if (!SILC_ID_CLIENT_COMPARE(client_id, conn->local_id)) + if (SILC_ID_CLIENT_COMPARE(client_id, conn->local_id)) break; /* Find old Client entry */ @@ -390,8 +383,7 @@ void silc_client_notify_by_server(SilcClient client, } /* Remove the old from cache */ - silc_idcache_del_by_id(conn->client_cache, SILC_ID_CLIENT, - client_entry->id); + silc_idcache_del_by_context(conn->client_cache, client_entry); /* Replace old ID entry with new one on all channels. */ silc_client_replace_from_channels(client, conn, client_entry, @@ -401,17 +393,7 @@ void silc_client_notify_by_server(SilcClient client, client->ops->notify(client, conn, type, client_entry, client_entry2); /* Free data */ - if (client_entry->nickname) - silc_free(client_entry->nickname); - if (client_entry->server) - silc_free(client_entry->server); - if (client_entry->id) - silc_free(client_entry->id); - if (client_entry->send_key) - silc_cipher_free(client_entry->send_key); - if (client_entry->receive_key) - silc_cipher_free(client_entry->receive_key); - silc_free(client_entry); + silc_client_del_client_entry(client, client_entry); break; case SILC_NOTIFY_TYPE_CMODE_CHANGE: @@ -442,26 +424,45 @@ void silc_client_notify_by_server(SilcClient client, goto out; } } else { - client_entry = NULL; + server_id = silc_id_payload_parse_id(tmp, tmp_len); + if (!server_id) { + silc_id_payload_free(idp); + goto out; + } + + server = silc_client_get_server_by_id(client, conn, server_id); + if (!server) { + silc_id_payload_free(idp); + silc_free(server_id); + goto out; + } + + /* Save the pointer to the client_entry pointer */ + client_entry = (SilcClientEntry)server; + silc_free(server_id); } - silc_id_payload_free(idp); - /* Get the mode */ tmp = silc_argument_get_arg_type(args, 2, &tmp_len); - if (!tmp) + if (!tmp) { + silc_id_payload_free(idp); goto out; + } SILC_GET32_MSB(mode, tmp); /* Get channel entry */ channel_id = silc_id_str2id(packet->dst_id, packet->dst_id_len, SILC_ID_CHANNEL); - if (!channel_id) + if (!channel_id) { + silc_id_payload_free(idp); goto out; + } if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) - break; + &id_cache)) { + silc_id_payload_free(idp); + goto out; + } channel = (SilcChannelEntry)id_cache->context; @@ -488,8 +489,10 @@ void silc_client_notify_by_server(SilcClient client, /* Notify application. The channel entry is sent last as this notify is for channel but application don't know it from the arguments sent by server. */ - client->ops->notify(client, conn, type, client_entry, mode, NULL, - tmp, channel); + client->ops->notify(client, conn, type, silc_id_payload_get_type(idp), + client_entry, mode, NULL, tmp, channel); + + silc_id_payload_free(idp); break; case SILC_NOTIFY_TYPE_CUMODE_CHANGE: @@ -507,10 +510,11 @@ void silc_client_notify_by_server(SilcClient client, goto out; /* Find Client entry */ - client_entry = - silc_client_get_client_by_id(client, conn, client_id); - if (!client_entry) + client_entry = silc_client_get_client_by_id(client, conn, client_id); + if (!client_entry) { + silc_client_notify_by_server_resolve(client, conn, packet, client_id); goto out; + } /* Get the mode */ tmp = silc_argument_get_arg_type(args, 2, &tmp_len); @@ -541,7 +545,7 @@ void silc_client_notify_by_server(SilcClient client, if (!channel_id) goto out; if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) + &id_cache)) break; channel = (SilcChannelEntry)id_cache->context; @@ -592,11 +596,14 @@ void silc_client_notify_by_server(SilcClient client, /* Get the channel entry */ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) + &id_cache)) break; channel = (SilcChannelEntry)id_cache->context; + SILC_LOG_DEBUG(("Old Channel ID id(%s)", + silc_id_render(channel->id, SILC_ID_CHANNEL))); + /* Free the old ID */ silc_free(channel->id); @@ -608,7 +615,13 @@ void silc_client_notify_by_server(SilcClient client, if (!channel->id) goto out; - id_cache->id = (void *)channel->id; + SILC_LOG_DEBUG(("New Channel ID id(%s)", + silc_id_render(channel->id, SILC_ID_CHANNEL))); + + /* Remove the old cache entry and create a new one */ + silc_idcache_del_by_context(conn->channel_cache, channel); + silc_idcache_add(conn->channel_cache, channel->channel_name, + channel->id, channel, FALSE); /* Notify application */ client->ops->notify(client, conn, type, channel, channel); @@ -639,7 +652,7 @@ void silc_client_notify_by_server(SilcClient client, if (!channel_id) goto out; if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) + &id_cache)) break; channel = (SilcChannelEntry)id_cache->context; @@ -656,8 +669,7 @@ void silc_client_notify_by_server(SilcClient client, if (client_entry == conn->local_entry) { if (conn->current_channel == channel) conn->current_channel = NULL; - silc_idcache_del_by_id(conn->channel_cache, - SILC_ID_CHANNEL, channel->id); + silc_idcache_del_by_id(conn->channel_cache, channel->id); silc_free(channel->channel_name); silc_free(channel->id); silc_free(channel->key); @@ -694,19 +706,7 @@ void silc_client_notify_by_server(SilcClient client, if (client_entry != conn->local_entry) { /* Remove client from all channels */ silc_client_remove_from_channels(client, conn, client_entry); - silc_idcache_del_by_id(conn->client_cache, SILC_ID_CLIENT, - client_entry->id); - if (client_entry->nickname) - silc_free(client_entry->nickname); - if (client_entry->server) - silc_free(client_entry->server); - if (client_entry->id) - silc_free(client_entry->id); - if (client_entry->send_key) - silc_cipher_free(client_entry->send_key); - if (client_entry->receive_key) - silc_cipher_free(client_entry->receive_key); - silc_free(client_entry); + silc_client_del_client(client, conn, client_entry); } break; @@ -718,7 +718,7 @@ void silc_client_notify_by_server(SilcClient client, * from channels as they quit as well. */ SilcClientEntry *clients = NULL; - unsigned int clients_count = 0; + uint32 clients_count = 0; int i; for (i = 1; i < silc_argument_get_arg_num(args); i++) { @@ -754,19 +754,7 @@ void silc_client_notify_by_server(SilcClient client, continue; silc_client_remove_from_channels(client, conn, client_entry); - silc_idcache_del_by_id(conn->client_cache, SILC_ID_CLIENT, - client_entry->id); - if (client_entry->nickname) - silc_free(client_entry->nickname); - if (client_entry->server) - silc_free(client_entry->server); - if (client_entry->id) - silc_free(client_entry->id); - if (client_entry->send_key) - silc_cipher_free(client_entry->send_key); - if (client_entry->receive_key) - silc_cipher_free(client_entry->receive_key); - silc_free(client_entry); + silc_client_del_client(client, conn, client_entry); } silc_free(clients);