X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand_reply.c;h=9a8b9fe6b1b82837e610accd5193b05a7737af4c;hp=8029eefbc1de77c12e62e81f3a34616cecd6d54b;hb=e5d8d3db6caa344b3d419b884556c21b15e7d123;hpb=186079e7fb070072090a395379f6b5f754604c2a diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c index 8029eefb..9a8b9fe6 100644 --- a/lib/silcclient/command_reply.c +++ b/lib/silcclient/command_reply.c @@ -82,8 +82,8 @@ const SilcCommandStatusMessage silc_command_status_messages[] = { { STAT(NO_SERVER_ID), "No Server ID given" }, { STAT(BAD_CLIENT_ID), "Bad Client ID" }, { STAT(BAD_CHANNEL_ID), "Bad Channel ID" }, - { STAT(NO_SUCH_CLIENT_ID), "No such Client ID" }, - { STAT(NO_SUCH_CHANNEL_ID),"No such Channel ID" }, + { STAT(NO_SUCH_CLIENT_ID), "There is no such client" }, + { STAT(NO_SUCH_CHANNEL_ID),"There is no such channel" }, { STAT(NICKNAME_IN_USE), "Nickname already exists" }, { STAT(NOT_ON_CHANNEL), "You are not on that channel" }, { STAT(USER_NOT_ON_CHANNEL),"They are not on the channel" }, @@ -122,6 +122,32 @@ const SilcCommandStatusMessage silc_command_status_messages[] = { cmd->sock->user_data, cmd->payload, FALSE, \ silc_command_get(cmd->payload), status) +/* All functions that call the COMMAND_CHECK_STATUS or the + COMMAND_CHECK_STATUS_LIST macros must have out: goto label. */ + +#define COMMAND_CHECK_STATUS \ +do { \ + SILC_LOG_DEBUG(("Start")); \ + SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); \ + if (status != SILC_STATUS_OK) { \ + COMMAND_REPLY_ERROR; \ + goto out; \ + } \ +} while(0) + +#define COMMAND_CHECK_STATUS_LIST \ +do { \ + SILC_LOG_DEBUG(("Start")); \ + SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); \ + if (status != SILC_STATUS_OK && \ + status != SILC_STATUS_LIST_START && \ + status != SILC_STATUS_LIST_ITEM && \ + status != SILC_STATUS_LIST_END) { \ + COMMAND_REPLY_ERROR; \ + goto out; \ + } \ +} while(0) + /* Process received command reply. */ void silc_client_command_reply_process(SilcClient client, @@ -168,7 +194,7 @@ void silc_client_command_reply_process(SilcClient client, return; } - cmd->cb(ctx); + cmd->cb(ctx, NULL); } /* Returns status message string */ @@ -193,7 +219,7 @@ char *silc_client_command_status_message(SilcCommandStatus status) void silc_client_command_reply_free(SilcClientCommandReplyContext cmd) { if (cmd) { - silc_command_free_payload(cmd->payload); + silc_command_payload_free(cmd->payload); silc_free(cmd); } } @@ -252,48 +278,18 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, SILC_GET32_MSB(idle, tmp); /* Check if we have this client cached already. */ - if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id, - SILC_ID_CLIENT, &id_cache)) { + if (!silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)client_id, + NULL, NULL, + silc_hash_client_id_compare, NULL, + &id_cache)) { SILC_LOG_DEBUG(("Adding new client entry")); - - client_entry = silc_calloc(1, sizeof(*client_entry)); - client_entry->id = client_id; - silc_parse_nickname(nickname, &client_entry->nickname, - &client_entry->server, &client_entry->num); - client_entry->username = strdup(username); - if (realname) - client_entry->realname = strdup(realname); - client_entry->mode = mode; - - /* Add client to cache */ - silc_idcache_add(conn->client_cache, client_entry->nickname, - strlen(client_entry->nickname), - SILC_ID_CLIENT, client_id, (void *)client_entry, - TRUE, FALSE); + client_entry = + silc_client_add_client(cmd->client, conn, nickname, username, realname, + client_id, mode); } else { client_entry = (SilcClientEntry)id_cache->context; - if (client_entry->nickname) - silc_free(client_entry->nickname); - if (client_entry->server) - silc_free(client_entry->server); - if (client_entry->username) - silc_free(client_entry->username); - if (client_entry->realname) - silc_free(client_entry->realname); - client_entry->mode = mode; - - SILC_LOG_DEBUG(("Updating client entry")); - - silc_parse_nickname(nickname, &client_entry->nickname, - &client_entry->server, &client_entry->num); - client_entry->username = strdup(username); - if (realname) - client_entry->realname = strdup(realname); - - id_cache->data = client_entry->nickname; - id_cache->data_len = strlen(client_entry->nickname); - silc_idcache_sort_by_data(conn->client_cache); - + silc_client_update_client(cmd->client, conn, client_entry, + nickname, username, realname, mode); silc_free(client_id); } @@ -313,29 +309,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcCommandStatus status; - unsigned char *tmp; - - SILC_LOG_DEBUG(("Start")); - - tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); - SILC_GET16_MSB(status, tmp); - if (status != SILC_STATUS_OK && - status != SILC_STATUS_LIST_START && - status != SILC_STATUS_LIST_ITEM && - status != SILC_STATUS_LIST_END) { - COMMAND_REPLY_ERROR; - goto out; - } - /* Display one whois reply */ - if (status == SILC_STATUS_OK) - silc_client_command_reply_whois_save(cmd, status); + COMMAND_CHECK_STATUS_LIST; - /* List */ - if (status == SILC_STATUS_LIST_START || - status == SILC_STATUS_LIST_ITEM || - status == SILC_STATUS_LIST_END) - silc_client_command_reply_whois_save(cmd, status); + /* Save WHOIS info */ + silc_client_command_reply_whois_save(cmd, status); /* Pending callbacks are not executed if this was an list entry */ if (status != SILC_STATUS_OK && @@ -344,10 +322,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois) return; } - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS); silc_client_command_reply_free(cmd); } @@ -363,37 +339,29 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) SilcIDCacheEntry id_cache = NULL; SilcClientEntry client_entry = NULL; uint32 len; - unsigned char *id_data, *tmp; + unsigned char *id_data; char *nickname, *username; char *realname = NULL; - SILC_LOG_DEBUG(("Start")); + COMMAND_CHECK_STATUS_LIST; - tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); - SILC_GET16_MSB(status, tmp); - if (status != SILC_STATUS_OK && - status != SILC_STATUS_LIST_START && - status != SILC_STATUS_LIST_ITEM && - status != SILC_STATUS_LIST_END) { - COMMAND_REPLY_ERROR; - goto out; - } - id_data = silc_argument_get_arg_type(cmd->args, 2, &len); if (!id_data) { COMMAND_REPLY_ERROR; - return; + goto out; } client_id = silc_id_payload_parse_id(id_data, len); if (!client_id) { COMMAND_REPLY_ERROR; - return; + goto out; } /* Get the client entry, if exists */ - if (silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id, - SILC_ID_CLIENT, &id_cache)) + if (silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)client_id, + NULL, NULL, + silc_hash_client_id_compare, NULL, + &id_cache)) client_entry = (SilcClientEntry)id_cache->context; silc_free(client_id); @@ -402,8 +370,9 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) realname = silc_argument_get_arg_type(cmd->args, 5, &len); if (!nickname || !username) { COMMAND_REPLY_ERROR; - return; + goto out; } + /* Notify application. We don't save any history information to any cache. Just pass the data to the application for displaying on the screen. */ @@ -416,10 +385,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) return; } - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS); silc_client_command_reply_free(cmd); } @@ -429,13 +396,20 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, SilcCommandStatus status) { SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SilcClientID *client_id; + SilcClient client = cmd->client; + SilcClientID *client_id = NULL; + SilcServerID *server_id = NULL; + SilcChannelID *channel_id = NULL; SilcIDCacheEntry id_cache = NULL; - SilcClientEntry client_entry = NULL; + SilcClientEntry client_entry; + SilcServerEntry server_entry; + SilcChannelEntry channel_entry; int argc; uint32 len; unsigned char *id_data; - char *nickname = NULL, *username = NULL; + char *name = NULL, *info = NULL; + SilcIDPayload idp = NULL; + SilcIdType id_type; argc = silc_argument_get_arg_num(cmd->args); @@ -444,59 +418,98 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, COMMAND_REPLY_ERROR; return; } - - client_id = silc_id_payload_parse_id(id_data, len); - if (!client_id) { + idp = silc_id_payload_parse_data(id_data, len); + if (!idp) { COMMAND_REPLY_ERROR; return; } - - nickname = silc_argument_get_arg_type(cmd->args, 3, &len); - username = silc_argument_get_arg_type(cmd->args, 4, &len); - /* Check if we have this client cached already. */ - if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id, - SILC_ID_CLIENT, &id_cache)) { - SILC_LOG_DEBUG(("Adding new client entry")); + name = silc_argument_get_arg_type(cmd->args, 3, &len); + info = silc_argument_get_arg_type(cmd->args, 4, &len); - client_entry = silc_calloc(1, sizeof(*client_entry)); - client_entry->id = client_id; - silc_parse_nickname(nickname, &client_entry->nickname, - &client_entry->server, &client_entry->num); - if (username) - client_entry->username = strdup(username); - - /* Add client to cache */ - silc_idcache_add(conn->client_cache, client_entry->nickname, - strlen(client_entry->nickname), - SILC_ID_CLIENT, client_id, (void *)client_entry, - TRUE, FALSE); - } else { - client_entry = (SilcClientEntry)id_cache->context; - if (client_entry->nickname) - silc_free(client_entry->nickname); - if (client_entry->server) - silc_free(client_entry->server); - if (username && client_entry->username) - silc_free(client_entry->username); - - SILC_LOG_DEBUG(("Updating client entry")); + id_type = silc_id_payload_get_type(idp); - silc_parse_nickname(nickname, &client_entry->nickname, - &client_entry->server, &client_entry->num); - - if (username) - client_entry->username = strdup(username); - - id_cache->data = client_entry->nickname; - id_cache->data_len = strlen(client_entry->nickname); - silc_idcache_sort_by_data(conn->client_cache); - - silc_free(client_id); + switch (id_type) { + case SILC_ID_CLIENT: + client_id = silc_id_payload_get_id(idp); + + SILC_LOG_DEBUG(("Received client information")); + + /* Check if we have this client cached already. */ + if (!silc_idcache_find_by_id_one_ext(conn->client_cache, + (void *)client_id, + NULL, NULL, + silc_hash_client_id_compare, NULL, + &id_cache)) { + SILC_LOG_DEBUG(("Adding new client entry")); + client_entry = + silc_client_add_client(cmd->client, conn, name, info, NULL, + silc_id_dup(client_id, id_type), 0); + } else { + client_entry = (SilcClientEntry)id_cache->context; + silc_client_update_client(cmd->client, conn, client_entry, + name, info, NULL, 0); + } + + /* Notify application */ + COMMAND_REPLY((ARGS, client_entry, name, info)); + break; + + case SILC_ID_SERVER: + server_id = silc_id_payload_get_id(idp); + + SILC_LOG_DEBUG(("Received server information")); + + /* Check if we have this server cached already. */ + if (!silc_idcache_find_by_id_one(conn->server_cache, + (void *)server_id, &id_cache)) { + SILC_LOG_DEBUG(("Adding new server entry")); + + server_entry = silc_calloc(1, sizeof(*server_entry)); + server_entry->server_id = silc_id_dup(server_id, id_type); + if (name) + server_entry->server_name = strdup(name); + if (info) + server_entry->server_info = strdup(info); + + /* Add server to cache */ + silc_idcache_add(conn->server_cache, server_entry->server_name, + server_entry->server_id, (void *)server_entry, FALSE); + } else { + server_entry = (SilcServerEntry)id_cache->context; + } + + /* Notify application */ + COMMAND_REPLY((ARGS, server_entry, name, info)); + break; + + case SILC_ID_CHANNEL: + channel_id = silc_id_payload_get_id(idp); + + SILC_LOG_DEBUG(("Received channel information")); + + /* Check if we have this channel cached already. */ + if (!silc_idcache_find_by_id_one(conn->channel_cache, + (void *)channel_id, &id_cache)) { + if (!name) + break; + + SILC_LOG_DEBUG(("Adding new channel entry")); + channel_entry = silc_client_new_channel_id(client, conn->sock, + strdup(name), 0, idp); + } else { + channel_entry = (SilcChannelEntry)id_cache->context; + } + + /* Notify application */ + COMMAND_REPLY((ARGS, channel_entry, name, info)); + break; } - /* Notify application */ - COMMAND_REPLY((ARGS, client_entry, nickname, username)); + silc_id_payload_free(idp); + silc_free(client_id); + silc_free(server_id); + silc_free(channel_id); } /* Received reply for IDENTIFY command. This maybe called several times @@ -507,29 +520,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcCommandStatus status; - unsigned char *tmp; - - SILC_LOG_DEBUG(("Start")); - - tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); - SILC_GET16_MSB(status, tmp); - if (status != SILC_STATUS_OK && - status != SILC_STATUS_LIST_START && - status != SILC_STATUS_LIST_ITEM && - status != SILC_STATUS_LIST_END) { - COMMAND_REPLY_ERROR; - goto out; - } - /* Save one IDENTIFY entry */ - if (status == SILC_STATUS_OK) - silc_client_command_reply_identify_save(cmd, status); + COMMAND_CHECK_STATUS_LIST; - /* List */ - if (status == SILC_STATUS_LIST_START || - status == SILC_STATUS_LIST_ITEM || - status == SILC_STATUS_LIST_END) - silc_client_command_reply_identify_save(cmd, status); + /* Save IDENTIFY info */ + silc_client_command_reply_identify_save(cmd, status); /* Pending callbacks are not executed if this was an list entry */ if (status != SILC_STATUS_OK && @@ -538,10 +533,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify) return; } - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY); silc_client_command_reply_free(cmd); } @@ -562,15 +555,16 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, "Cannot set nickname: %s", - silc_client_command_status_message(status)); + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "Cannot set nickname: %s", + silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } argc = silc_argument_get_arg_num(cmd->args); if (argc < 2 || argc > 2) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot set nickname: bad reply to command"); COMMAND_REPLY_ERROR; goto out; @@ -588,10 +582,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) /* Notify application */ COMMAND_REPLY((ARGS, conn->local_entry)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_NICK); silc_client_command_reply_free(cmd); } @@ -605,15 +597,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(list) unsigned char *tmp, *name, *topic; uint32 usercount = 0; - tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); - SILC_GET16_MSB(status, tmp); - if (status != SILC_STATUS_OK && - status != SILC_STATUS_LIST_START && - status != SILC_STATUS_LIST_ITEM && - status != SILC_STATUS_LIST_END) { - COMMAND_REPLY_ERROR; - goto out; - } + COMMAND_CHECK_STATUS_LIST; name = silc_argument_get_arg_type(cmd->args, 3, NULL); topic = silc_argument_get_arg_type(cmd->args, 4, NULL); @@ -631,10 +615,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(list) return; } - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LIST); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LIST); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_LIST); silc_client_command_reply_free(cmd); } @@ -655,12 +637,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; - SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_TOPIC); - silc_client_command_reply_free(cmd); - return; + goto out; } argc = silc_argument_get_arg_num(cmd->args); @@ -685,7 +665,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) /* Get the channel entry */ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) { + &id_cache)) { silc_free(channel_id); COMMAND_REPLY_ERROR; goto out; @@ -693,17 +673,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) channel = (SilcChannelEntry)id_cache->context; - cmd->client->ops->say(cmd->client, conn, - "Topic on channel %s: %s", channel->channel_name, - topic); - /* Notify application */ COMMAND_REPLY((ARGS, channel, topic)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_TOPIC); silc_client_command_reply_free(cmd); } @@ -724,12 +698,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; - SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INVITE); - silc_client_command_reply_free(cmd); - return; + goto out; } /* Take Channel ID */ @@ -743,7 +715,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) /* Get the channel entry */ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) { + &id_cache)) { silc_free(channel_id); COMMAND_REPLY_ERROR; goto out; @@ -757,10 +729,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) /* Notify application */ COMMAND_REPLY((ARGS, channel, tmp)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INVITE); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INVITE); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INVITE); silc_client_command_reply_free(cmd); } @@ -772,12 +742,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(kill) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcCommandStatus status; - unsigned char *tmp; - tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); - SILC_GET16_MSB(status, tmp); + SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -786,10 +754,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(kill) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KILL); silc_client_command_reply_free(cmd); } @@ -801,48 +767,66 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SilcClient client = cmd->client; SilcCommandStatus status; unsigned char *tmp; + SilcIDCacheEntry id_cache; + SilcServerEntry server; + SilcServerID *server_id = NULL; + char *server_name, *server_info; + uint32 len; tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; - SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INFO); - silc_client_command_reply_free(cmd); - return; + goto out; } /* Get server ID */ - tmp = silc_argument_get_arg_type(cmd->args, 2, NULL); + tmp = silc_argument_get_arg_type(cmd->args, 2, &len); if (!tmp) goto out; - /* XXX save server id */ + server_id = silc_id_payload_parse_id(tmp, len); + if (!server_id) + goto out; /* Get server name */ - tmp = silc_argument_get_arg_type(cmd->args, 3, NULL); - if (!tmp) + server_name = silc_argument_get_arg_type(cmd->args, 3, NULL); + if (!server_name) goto out; /* Get server info */ - tmp = silc_argument_get_arg_type(cmd->args, 4, NULL); - if (!tmp) + server_info = silc_argument_get_arg_type(cmd->args, 4, NULL); + if (!server_info) goto out; - client->ops->say(cmd->client, conn, "Info: %s", tmp); + /* See whether we have this server cached. If not create it. */ + if (!silc_idcache_find_by_id_one(conn->server_cache, (void *)server_id, + &id_cache)) { + SILC_LOG_DEBUG(("New server entry")); - /* Notify application */ - COMMAND_REPLY((ARGS, NULL, (char *)tmp)); + server = silc_calloc(1, sizeof(*server)); + server->server_name = strdup(server_name); + server->server_info = strdup(server_info); + server->server_id = silc_id_dup(server_id, SILC_ID_SERVER); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO); + /* Add it to the cache */ + silc_idcache_add(conn->server_cache, server->server_name, + server->server_id, (void *)server, FALSE); + } else { + server = (SilcServerEntry)id_cache->context; + } + + /* Notify application */ + COMMAND_REPLY((ARGS, server, server->server_name, server->server_info)); out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INFO); + silc_free(server_id); silc_client_command_reply_free(cmd); } @@ -859,7 +843,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -876,7 +860,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) for (i = 0; i < conn->ping_count; i++) { if (SILC_ID_SERVER_COMPARE(conn->ping[i].dest_id, id)) { diff = curtime - conn->ping[i].start_time; - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, "Ping reply from %s: %d second%s", conn->ping[i].dest_name, diff, diff == 1 ? "" : "s"); @@ -895,10 +879,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_PING); silc_client_command_reply_free(cmd); } @@ -916,14 +898,14 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) SilcChannelUser chu; uint32 argc, mode, len, list_count; char *topic, *tmp, *channel_name = NULL, *hmac; - SilcBuffer keyp = NULL, client_id_list, client_mode_list; + SilcBuffer keyp = NULL, client_id_list = NULL, client_mode_list = NULL; int i; SILC_LOG_DEBUG(("Start")); SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -931,7 +913,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) argc = silc_argument_get_arg_num(cmd->args); if (argc < 7 || argc > 14) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); COMMAND_REPLY_ERROR; goto out; @@ -940,7 +922,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) /* Get channel name */ tmp = silc_argument_get_arg_type(cmd->args, 2, NULL); if (!tmp) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); COMMAND_REPLY_ERROR; goto out; @@ -950,7 +932,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) /* Get Channel ID */ tmp = silc_argument_get_arg_type(cmd->args, 3, &len); if (!tmp) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); COMMAND_REPLY_ERROR; silc_free(channel_name); @@ -981,16 +963,23 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) /* Get topic */ topic = silc_argument_get_arg_type(cmd->args, 10, NULL); + /* If we have the channel entry, remove it and create a new one */ + channel = silc_client_get_channel(cmd->client, conn, channel_name); + if (channel) + silc_client_del_channel(cmd->client, conn, channel); + /* Save received Channel ID. This actually creates the channel */ channel = silc_client_new_channel_id(cmd->client, cmd->sock, channel_name, mode, idp); silc_id_payload_free(idp); + conn->current_channel = channel; + /* Get hmac */ hmac = silc_argument_get_arg_type(cmd->args, 11, NULL); if (hmac) { if (!silc_hmac_alloc(hmac, NULL, &channel->hmac)) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Unsupported HMAC `%s'", hmac); COMMAND_REPLY_ERROR; @@ -1041,13 +1030,15 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) SILC_GET32_MSB(mode, client_mode_list->data); /* Check if we have this client cached already. */ - if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id, - SILC_ID_CLIENT, &id_cache)) { + if (!silc_idcache_find_by_id_one_ext(conn->client_cache, + (void *)client_id, + NULL, NULL, + silc_hash_client_id_compare, NULL, + &id_cache)) { /* No, we don't have it, add entry for it. */ - client_entry = silc_calloc(1, sizeof(*client_entry)); - client_entry->id = silc_id_dup(client_id, SILC_ID_CLIENT); - silc_idcache_add(conn->client_cache, NULL, 0, SILC_ID_CLIENT, - client_entry->id, (void *)client_entry, FALSE, FALSE); + client_entry = + silc_client_add_client(cmd->client, conn, NULL, NULL, NULL, + silc_id_dup(client_id, SILC_ID_CLIENT), 0); } else { /* Yes, we have it already */ client_entry = (SilcClientEntry)id_cache->context; @@ -1081,17 +1072,17 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) NULL, topic, hmac, list_count, client_id_list, client_mode_list)); - /* Execute any pending command callbacks */ + out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_JOIN); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN); + silc_client_command_reply_free(cmd); if (keyp) silc_buffer_free(keyp); - silc_buffer_free(client_id_list); - silc_buffer_free(client_mode_list); - - out: - SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN); - silc_client_command_reply_free(cmd); + if (client_id_list) + silc_buffer_free(client_id_list); + if (client_mode_list) + silc_buffer_free(client_mode_list); } /* Received reply for MOTD command */ @@ -1108,7 +1099,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; return; @@ -1138,7 +1129,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) if (i == 2) line[0] = ' '; - cmd->client->ops->say(cmd->client, conn, "%s", line); + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "%s", line); if (!strlen(cp)) break; @@ -1150,10 +1142,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) /* Notify application */ COMMAND_REPLY((ARGS, motd)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_MOTD); silc_client_command_reply_free(cmd); } @@ -1171,7 +1161,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(umode) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1189,10 +1179,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(umode) /* Notify application */ COMMAND_REPLY((ARGS, mode)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_UMODE); silc_client_command_reply_free(cmd); } @@ -1205,29 +1193,57 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcCommandStatus status; unsigned char *tmp; + uint32 mode; + SilcIDCacheEntry id_cache; + SilcChannelID *channel_id; + SilcChannelEntry channel; + uint32 len; SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } + /* Take Channel ID */ + tmp = silc_argument_get_arg_type(cmd->args, 2, &len); + if (!tmp) + goto out; + channel_id = silc_id_payload_parse_id(tmp, len); + if (!channel_id) + goto out; + + /* Get the channel entry */ + if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, + &id_cache)) { + silc_free(channel_id); + COMMAND_REPLY_ERROR; + goto out; + } + + channel = (SilcChannelEntry)id_cache->context; + /* Get channel mode */ - tmp = silc_argument_get_arg_type(cmd->args, 2, NULL); + tmp = silc_argument_get_arg_type(cmd->args, 3, NULL); if (!tmp) { + silc_free(channel_id); COMMAND_REPLY_ERROR; goto out; } + /* Save the mode */ + SILC_GET32_MSB(mode, tmp); + channel->mode = mode; + /* Notify application */ - COMMAND_REPLY((ARGS, tmp)); + COMMAND_REPLY((ARGS, channel, mode)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CMODE); + silc_free(channel_id); out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CMODE); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CMODE); silc_client_command_reply_free(cmd); } @@ -1241,51 +1257,90 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) SilcCommandStatus status; SilcIDCacheEntry id_cache = NULL; SilcClientID *client_id; - unsigned char *tmp, *id; - uint32 len; + SilcChannelID *channel_id; + SilcClientEntry client_entry; + SilcChannelEntry channel; + SilcChannelUser chu; + unsigned char *modev, *tmp, *id; + uint32 len, mode; SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } /* Get channel mode */ - tmp = silc_argument_get_arg_type(cmd->args, 2, NULL); - if (!tmp) { + modev = silc_argument_get_arg_type(cmd->args, 2, NULL); + if (!modev) { COMMAND_REPLY_ERROR; goto out; } + /* Take Channel ID */ + tmp = silc_argument_get_arg_type(cmd->args, 3, &len); + if (!tmp) + goto out; + channel_id = silc_id_payload_parse_id(tmp, len); + if (!channel_id) + goto out; + + /* Get the channel entry */ + if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, + &id_cache)) { + silc_free(channel_id); + COMMAND_REPLY_ERROR; + goto out; + } + + channel = (SilcChannelEntry)id_cache->context; + /* Get Client ID */ - id = silc_argument_get_arg_type(cmd->args, 3, &len); + id = silc_argument_get_arg_type(cmd->args, 4, &len); if (!id) { + silc_free(channel_id); COMMAND_REPLY_ERROR; goto out; } client_id = silc_id_payload_parse_id(id, len); if (!client_id) { + silc_free(channel_id); COMMAND_REPLY_ERROR; goto out; } /* Get client entry */ - if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id, - SILC_ID_CLIENT, &id_cache)) { + if (!silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)client_id, + NULL, NULL, + silc_hash_client_id_compare, NULL, + &id_cache)) { + silc_free(channel_id); + silc_free(client_id); COMMAND_REPLY_ERROR; goto out; } + client_entry = (SilcClientEntry)id_cache->context; + + /* Save the mode */ + SILC_GET32_MSB(mode, modev); + silc_list_start(channel->clients); + while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) { + if (chu->client == client_entry) { + chu->mode = mode; + break; + } + } + /* Notify application */ - COMMAND_REPLY((ARGS, tmp, (SilcClientEntry)id_cache->context)); + COMMAND_REPLY((ARGS, mode, channel, client_entry)); silc_free(client_id); + silc_free(channel_id); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CUMODE); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CUMODE); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CUMODE); silc_client_command_reply_free(cmd); } @@ -1300,7 +1355,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(kick) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1309,10 +1364,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(kick) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KICK); silc_client_command_reply_free(cmd); } @@ -1327,7 +1380,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(silcoper) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1336,10 +1389,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(silcoper) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SILCOPER); silc_client_command_reply_free(cmd); } @@ -1354,7 +1405,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(oper) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1363,10 +1414,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(oper) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_OPER); silc_client_command_reply_free(cmd); } @@ -1381,7 +1430,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(connect) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1390,10 +1439,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(connect) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CONNECT); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CONNECT); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CONNECT); silc_client_command_reply_free(cmd); } @@ -1412,7 +1459,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(ban) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1429,7 +1476,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(ban) /* Get the channel entry */ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) { + &id_cache)) { silc_free(channel_id); COMMAND_REPLY_ERROR; goto out; @@ -1443,10 +1490,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(ban) /* Notify application */ COMMAND_REPLY((ARGS, channel, tmp)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_BAN); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_BAN); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_BAN); silc_client_command_reply_free(cmd); } @@ -1461,7 +1506,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(close) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1470,10 +1515,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(close) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CLOSE); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CLOSE); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CLOSE); silc_client_command_reply_free(cmd); } @@ -1488,7 +1531,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(shutdown) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1497,10 +1540,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(shutdown) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SHUTDOWN); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SHUTDOWN); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SHUTDOWN); silc_client_command_reply_free(cmd); } @@ -1517,7 +1558,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(leave) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1526,10 +1567,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(leave) /* Notify application */ COMMAND_REPLY((ARGS)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE); - out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_LEAVE); silc_client_command_reply_free(cmd); } @@ -1546,8 +1585,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) SilcChannelEntry channel; SilcChannelUser chu; SilcChannelID *channel_id = NULL; - SilcBuffer client_id_list; - SilcBuffer client_mode_list; + SilcBuffer client_id_list = NULL; + SilcBuffer client_mode_list = NULL; unsigned char *tmp; uint32 tmp_len, list_count; int i; @@ -1559,7 +1598,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1567,22 +1606,30 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) /* Get channel ID */ tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len); - if (!tmp) + if (!tmp) { + COMMAND_REPLY_ERROR; goto out; + } channel_id = silc_id_payload_parse_id(tmp, tmp_len); - if (!channel_id) + if (!channel_id) { + COMMAND_REPLY_ERROR; goto out; - + } + /* Get the list count */ tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len); - if (!tmp) + if (!tmp) { + COMMAND_REPLY_ERROR; goto out; + } SILC_GET32_MSB(list_count, tmp); /* Get Client ID list */ tmp = silc_argument_get_arg_type(cmd->args, 4, &tmp_len); - if (!tmp) + if (!tmp) { + COMMAND_REPLY_ERROR; goto out; + } client_id_list = silc_buffer_alloc(tmp_len); silc_buffer_pull_tail(client_id_list, tmp_len); @@ -1590,8 +1637,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) /* Get client mode list */ tmp = silc_argument_get_arg_type(cmd->args, 5, &tmp_len); - if (!tmp) + if (!tmp) { + COMMAND_REPLY_ERROR; goto out; + } client_mode_list = silc_buffer_alloc(tmp_len); silc_buffer_pull_tail(client_mode_list, tmp_len); @@ -1599,11 +1648,19 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) /* Get channel entry */ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id, - SILC_ID_CHANNEL, &id_cache)) { - COMMAND_REPLY_ERROR; - goto out; + &id_cache)) { + /* Resolve the channel from server */ + silc_idlist_get_channel_by_id(cmd->client, conn, channel_id, TRUE); + + /* Register pending command callback. After we've received the channel + information we will reprocess this command reply by re-calling this + USERS command reply callback. */ + silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident, + NULL, silc_client_command_reply_users, cmd); + return; + } else { + channel = (SilcChannelEntry)id_cache->context; } - channel = (SilcChannelEntry)id_cache->context; /* Remove old client list from channel. */ silc_list_start(channel->clients); @@ -1612,9 +1669,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) silc_free(chu); } - /* Cache the received Client ID's and modes. This cache expires - whenever server sends notify message to channel. It means two things; - some user has joined or leaved the channel. XXX! */ + /* Cache the received Client ID's and modes. */ for (i = 0; i < list_count; i++) { uint16 idp_len; uint32 mode; @@ -1632,10 +1687,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) SILC_GET32_MSB(mode, client_mode_list->data); /* Check if we have this client cached already. */ - if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id, - SILC_ID_CLIENT, &id_cache)) { - /* No we don't have it, query it from the server. Assemble argument - table that will be sent fr the IDENTIFY command later. */ + id_cache = NULL; + silc_idcache_find_by_id_one_ext(conn->client_cache, + (void *)client_id, + NULL, NULL, + silc_hash_client_id_compare, NULL, + &id_cache); + + if (!id_cache || !((SilcClientEntry)id_cache->context)->username || + !((SilcClientEntry)id_cache->context)->realname) { + /* No we don't have it (or it is incomplete in information), query + it from the server. Assemble argument table that will be sent + for the WHOIS command later. */ res_argv = silc_realloc(res_argv, sizeof(*res_argv) * (res_argc + 1)); res_argv_lens = silc_realloc(res_argv_lens, sizeof(*res_argv_lens) * @@ -1667,18 +1730,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) if (res_argc) { SilcBuffer res_cmd; - /* Send the IDENTIFY command to server */ - res_cmd = silc_command_payload_encode(SILC_COMMAND_IDENTIFY, + /* Send the WHOIS command to server */ + res_cmd = silc_command_payload_encode(SILC_COMMAND_WHOIS, res_argc, res_argv, res_argv_lens, res_argv_types, ++conn->cmd_ident); silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, res_cmd->data, res_cmd->len, TRUE); - /* Register pending command callback. After we've received the IDENTIFY + /* Register pending command callback. After we've received the WHOIS command reply we will reprocess this command reply by re-calling this USERS command reply callback. */ - silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident, + silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident, NULL, silc_client_command_reply_users, cmd); silc_buffer_free(res_cmd); @@ -1694,17 +1757,15 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) /* Notify application */ COMMAND_REPLY((ARGS, channel, list_count, client_id_list, client_mode_list)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS); - - silc_buffer_free(client_id_list); - silc_buffer_free(client_mode_list); - out: - if (channel_id) - silc_free(channel_id); + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_USERS); silc_client_command_reply_free(cmd); + silc_free(channel_id); + if (client_id_list) + silc_buffer_free(client_id_list); + if (client_mode_list) + silc_buffer_free(client_mode_list); } /* Received command reply to GETKEY command. WE've received the remote @@ -1719,6 +1780,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) SilcIDPayload idp = NULL; SilcClientID *client_id = NULL; SilcClientEntry client_entry; + SilcServerID *server_id = NULL; + SilcServerEntry server_entry; SilcSKEPKType type; unsigned char *tmp, *pk; uint32 len; @@ -1731,61 +1794,82 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); SILC_GET16_MSB(status, tmp); if (status != SILC_STATUS_OK) { - cmd->client->ops->say(cmd->client, conn, - "%s", silc_client_command_status_message(status)); + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } tmp = silc_argument_get_arg_type(cmd->args, 2, &len); - if (!tmp) + if (!tmp) { + COMMAND_REPLY_ERROR; goto out; + } idp = silc_id_payload_parse_data(tmp, len); - if (!idp) + if (!idp) { + COMMAND_REPLY_ERROR; goto out; + } /* Get the public key payload */ tmp = silc_argument_get_arg_type(cmd->args, 3, &len); - if (!tmp) - goto out; - - /* Decode the public key */ - - SILC_GET16_MSB(pk_len, tmp); - SILC_GET16_MSB(type, tmp + 2); - pk = tmp + 4; - - if (type != SILC_SKE_PK_TYPE_SILC) - goto out; - - if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key)) - goto out; - + if (tmp) { + /* Decode the public key */ + SILC_GET16_MSB(pk_len, tmp); + SILC_GET16_MSB(type, tmp + 2); + pk = tmp + 4; + + if (type != SILC_SKE_PK_TYPE_SILC) { + COMMAND_REPLY_ERROR; + goto out; + } + + if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key)) { + COMMAND_REPLY_ERROR; + goto out; + } + } + id_type = silc_id_payload_get_type(idp); if (id_type == SILC_ID_CLIENT) { + /* Received client's public key */ client_id = silc_id_payload_get_id(idp); - - if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id, - SILC_ID_CLIENT, &id_cache)) + if (!silc_idcache_find_by_id_one_ext(conn->client_cache, + (void *)client_id, + NULL, NULL, + silc_hash_client_id_compare, NULL, + &id_cache)) { + COMMAND_REPLY_ERROR; goto out; + } client_entry = (SilcClientEntry)id_cache->context; /* Notify application */ COMMAND_REPLY((ARGS, id_type, client_entry, public_key)); } else if (id_type == SILC_ID_SERVER) { - /* XXX we don't have server entries at all */ - goto out; - } else { - goto out; + /* Received server's public key */ + server_id = silc_id_payload_get_id(idp); + if (!silc_idcache_find_by_id_one(conn->server_cache, (void *)server_id, + &id_cache)) { + COMMAND_REPLY_ERROR; + goto out; + } + + server_entry = (SilcServerEntry)id_cache->context; + + /* Notify application */ + COMMAND_REPLY((ARGS, id_type, server_entry, public_key)); } out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_GETKEY); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_GETKEY); if (idp) silc_id_payload_free(idp); if (public_key) silc_pkcs_public_key_free(public_key); silc_free(client_id); + silc_free(server_id); silc_client_command_reply_free(cmd); }