X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand_reply.c;h=9a8b9fe6b1b82837e610accd5193b05a7737af4c;hp=80cee3bac93afe6668c32b7cd92bc0e11440ecad;hb=e5d8d3db6caa344b3d419b884556c21b15e7d123;hpb=66dc2106d8870af33de62148d586635c693a0145 diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c index 80cee3ba..9a8b9fe6 100644 --- a/lib/silcclient/command_reply.c +++ b/lib/silcclient/command_reply.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2000 Pekka Riikonen + Copyright (C) 1997 - 2001 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 @@ -34,6 +34,7 @@ /* $Id$ */ #include "clientlibincludes.h" +#include "client_internal.h" /* Client command reply list. */ SilcClientCommandReply silc_command_reply_list[] = @@ -45,7 +46,6 @@ SilcClientCommandReply silc_command_reply_list[] = SILC_CLIENT_CMD_REPLY(list, LIST), SILC_CLIENT_CMD_REPLY(topic, TOPIC), SILC_CLIENT_CMD_REPLY(invite, INVITE), - SILC_CLIENT_CMD_REPLY(quit, QUIT), SILC_CLIENT_CMD_REPLY(kill, KILL), SILC_CLIENT_CMD_REPLY(info, INFO), SILC_CLIENT_CMD_REPLY(connect, CONNECT), @@ -57,28 +57,21 @@ SilcClientCommandReply silc_command_reply_list[] = SILC_CLIENT_CMD_REPLY(cmode, CMODE), SILC_CLIENT_CMD_REPLY(cumode, CUMODE), SILC_CLIENT_CMD_REPLY(kick, KICK), - SILC_CLIENT_CMD_REPLY(restart, RESTART), + SILC_CLIENT_CMD_REPLY(ban, BAN), SILC_CLIENT_CMD_REPLY(close, CLOSE), - SILC_CLIENT_CMD_REPLY(die, DIE), + SILC_CLIENT_CMD_REPLY(shutdown, SHUTDOWN), SILC_CLIENT_CMD_REPLY(silcoper, SILCOPER), SILC_CLIENT_CMD_REPLY(leave, LEAVE), - SILC_CLIENT_CMD_REPLY(names, NAMES), + SILC_CLIENT_CMD_REPLY(users, USERS), + SILC_CLIENT_CMD_REPLY(getkey, GETKEY), { NULL, 0 }, }; -/* Status message structure. Messages are defined below. */ -typedef struct { - SilcCommandStatus status; - char *message; -} SilcCommandStatusMessage; - -/* Status messages returned by the server */ -#define STAT(x) SILC_STATUS_ERR_##x const SilcCommandStatusMessage silc_command_status_messages[] = { - { STAT(NO_SUCH_NICK), "No such nickname" }, - { STAT(NO_SUCH_CHANNEL), "No such channel" }, + { STAT(NO_SUCH_NICK), "There was no such nickname" }, + { STAT(NO_SUCH_CHANNEL), "There was no such channel" }, { STAT(NO_SUCH_SERVER), "No such server" }, { STAT(TOO_MANY_TARGETS), "Duplicate recipients. No message delivered" }, { STAT(NO_RECIPIENT), "No recipient given" }, @@ -89,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" }, @@ -98,7 +91,7 @@ const SilcCommandStatusMessage silc_command_status_messages[] = { { STAT(NOT_REGISTERED), "You have not registered" }, { STAT(NOT_ENOUGH_PARAMS), "Not enough parameters" }, { STAT(TOO_MANY_PARAMS), "Too many parameters" }, - { STAT(PERM_DENIED), "Your host is not among the privileged" }, + { STAT(PERM_DENIED), "Permission denied" }, { STAT(BANNED_FROM_SERVER),"You are banned from this server" }, { STAT(BAD_PASSWORD), "Cannot join channel. Incorrect password" }, { STAT(CHANNEL_IS_FULL), "Cannot join channel. Channel is full" }, @@ -107,15 +100,17 @@ const SilcCommandStatusMessage silc_command_status_messages[] = { { STAT(UNKNOWN_MODE), "Unknown mode" }, { STAT(NOT_YOU), "Cannot change mode for other users" }, { STAT(NO_CHANNEL_PRIV), "Permission denied. You are not channel operator" }, + { STAT(NO_CHANNEL_FOPRIV),"Permission denied. You are not channel founder" }, { STAT(NO_SERVER_PRIV), "Permission denied. You are not server operator" }, { STAT(NO_ROUTER_PRIV), "Permission denied. You are not SILC operator" }, { STAT(BAD_NICKNAME), "Bad nickname" }, { STAT(BAD_CHANNEL), "Bad channel name" }, { STAT(AUTH_FAILED), "Authentication failed" }, + { STAT(UNKNOWN_ALGORITHM), "Unsupported algorithm" }, + { STAT(NO_SUCH_SERVER_ID), "No such Server ID" }, { 0, NULL } }; - /* Command reply operation that is called at the end of all command replys. Usage: COMMAND_REPLY((ARGS, argument1, argument2, etc...)), */ #define COMMAND_REPLY(args) cmd->client->ops->command_reply args @@ -127,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, @@ -134,8 +155,11 @@ void silc_client_command_reply_process(SilcClient client, SilcPacketContext *packet) { SilcBuffer buffer = packet->buffer; + SilcClientCommandReply *cmd; SilcClientCommandReplyContext ctx; SilcCommandPayload payload; + SilcCommand command; + uint16 ident; /* Get command reply payload from packet */ payload = silc_command_payload_parse(buffer); @@ -153,18 +177,29 @@ void silc_client_command_reply_process(SilcClient client, ctx->payload = payload; ctx->args = silc_command_get_args(ctx->payload); ctx->packet = packet; + ident = silc_command_get_ident(ctx->payload); /* Check for pending commands and mark to be exeucted */ - SILC_CLIENT_COMMAND_CHECK_PENDING(ctx); - + silc_client_command_pending_check(sock->user_data, ctx, + silc_command_get(ctx->payload), ident); + /* Execute command reply */ - SILC_CLIENT_COMMAND_REPLY_EXEC(ctx); + command = silc_command_get(ctx->payload); + for (cmd = silc_command_reply_list; cmd->cb; cmd++) + if (cmd->cmd == command) + break; + + if (cmd == NULL || !cmd->cb) { + silc_free(ctx); + return; + } + + cmd->cb(ctx, NULL); } /* Returns status message string */ -static char * -silc_client_command_status_message(SilcCommandStatus status) +char *silc_client_command_status_message(SilcCommandStatus status) { int i; @@ -184,26 +219,26 @@ 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); } } static void -silc_client_command_reply_whois_print(SilcClientCommandReplyContext cmd, - SilcCommandStatus status) +silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, + SilcCommandStatus status) { - char buf[256]; - int argc, len; - unsigned char *id_data; - char *nickname = NULL, *username = NULL; - char *realname = NULL; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcClientID *client_id; SilcIDCacheEntry id_cache = NULL; SilcClientEntry client_entry = NULL; - SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - - memset(buf, 0, sizeof(buf)); + int argc; + uint32 len; + unsigned char *id_data, *tmp; + char *nickname = NULL, *username = NULL; + char *realname = NULL; + uint32 idle = 0, mode = 0; + SilcBuffer channels = NULL; argc = silc_argument_get_arg_num(cmd->args); @@ -214,65 +249,57 @@ silc_client_command_reply_whois_print(SilcClientCommandReplyContext cmd, } client_id = silc_id_payload_parse_id(id_data, len); - - nickname = silc_argument_get_arg_type(cmd->args, 3, &len); - if (nickname) { - strncat(buf, nickname, len); - strncat(buf, " is ", 4); + if (!client_id) { + COMMAND_REPLY_ERROR; + return; } + nickname = silc_argument_get_arg_type(cmd->args, 3, &len); username = silc_argument_get_arg_type(cmd->args, 4, &len); - if (username) { - strncat(buf, username, len); - } - realname = silc_argument_get_arg_type(cmd->args, 5, &len); - if (realname) { - strncat(buf, " (", 2); - strncat(buf, realname, len); - strncat(buf, ")", 1); + if (!nickname || !username || !realname) { + COMMAND_REPLY_ERROR; + return; } - + + tmp = silc_argument_get_arg_type(cmd->args, 6, &len); + if (tmp) { + channels = silc_buffer_alloc(len); + silc_buffer_pull_tail(channels, SILC_BUFFER_END(channels)); + silc_buffer_put(channels, tmp, len); + } + + tmp = silc_argument_get_arg_type(cmd->args, 7, &len); + if (tmp) + SILC_GET32_MSB(mode, tmp); + + tmp = silc_argument_get_arg_type(cmd->args, 8, &len); + if (tmp) + 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)) { - 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); - - /* Add client to cache */ - silc_idcache_add(conn->client_cache, client_entry->nickname, - SILC_ID_CLIENT, client_id, (void *)client_entry, TRUE); + 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, 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); - - 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); - + silc_client_update_client(cmd->client, conn, client_entry, + nickname, username, realname, mode); silc_free(client_id); } + /* Notify application */ if (!cmd->callback) - cmd->client->ops->say(cmd->client, conn, "%s", buf); + COMMAND_REPLY((ARGS, client_entry, nickname, username, realname, + channels, mode, idle)); - /* Notify application */ - COMMAND_REPLY((ARGS, client_entry, nickname, - username, realname, NULL, NULL)); + if (channels) + silc_buffer_free(channels); } /* Received reply for WHOIS command. This maybe called several times @@ -281,162 +308,234 @@ silc_client_command_reply_whois_print(SilcClientCommandReplyContext cmd, SILC_CLIENT_CMD_REPLY_FUNC(whois) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; - SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcCommandStatus status; - unsigned char *tmp; - 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 && + /* 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 && status != SILC_STATUS_LIST_END) { - if (status == SILC_STATUS_ERR_NO_SUCH_NICK) { - /* Take nickname which may be provided */ - tmp = silc_argument_get_arg_type(cmd->args, 3, NULL); - if (tmp) - cmd->client->ops->say(cmd->client, conn, "%s: %s", tmp, - silc_client_command_status_message(status)); - else - cmd->client->ops->say(cmd->client, conn, "%s", - silc_client_command_status_message(status)); - COMMAND_REPLY_ERROR; - goto out; - } else { - cmd->client->ops->say(cmd->client, conn, - "%s", silc_client_command_status_message(status)); - COMMAND_REPLY_ERROR; - goto out; - } + silc_client_command_reply_free(cmd); + return; } - /* Display one whois reply */ - if (status == SILC_STATUS_OK) { - silc_client_command_reply_whois_print(cmd, status); - } + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS); + silc_client_command_reply_free(cmd); +} - /* XXX list should not be displayed untill all items has been received. */ - if (status == SILC_STATUS_LIST_START) { - silc_client_command_reply_whois_print(cmd, status); - } +/* Received reply for WHOWAS command. */ + +SILC_CLIENT_CMD_REPLY_FUNC(whowas) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcCommandStatus status; + SilcClientID *client_id; + SilcIDCacheEntry id_cache = NULL; + SilcClientEntry client_entry = NULL; + uint32 len; + unsigned char *id_data; + char *nickname, *username; + char *realname = NULL; - if (status == SILC_STATUS_LIST_ITEM) { - silc_client_command_reply_whois_print(cmd, status); + COMMAND_CHECK_STATUS_LIST; + + id_data = silc_argument_get_arg_type(cmd->args, 2, &len); + if (!id_data) { + COMMAND_REPLY_ERROR; + goto out; + } + + client_id = silc_id_payload_parse_id(id_data, len); + if (!client_id) { + COMMAND_REPLY_ERROR; + goto out; } - if (status == SILC_STATUS_LIST_END) { - silc_client_command_reply_whois_print(cmd, status); + /* Get the client entry, if exists */ + 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); + + nickname = silc_argument_get_arg_type(cmd->args, 3, &len); + username = silc_argument_get_arg_type(cmd->args, 4, &len); + realname = silc_argument_get_arg_type(cmd->args, 5, &len); + if (!nickname || !username) { + COMMAND_REPLY_ERROR; + goto out; } - SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_WHOIS); + /* Notify application. We don't save any history information to any + cache. Just pass the data to the application for displaying on + the screen. */ + COMMAND_REPLY((ARGS, client_entry, nickname, username, realname)); + + /* Pending callbacks are not executed if this was an list entry */ + if (status != SILC_STATUS_OK && + status != SILC_STATUS_LIST_END) { + silc_client_command_reply_free(cmd); + return; + } out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS); silc_client_command_reply_free(cmd); } -/* Received reply for WHOWAS command. */ - -SILC_CLIENT_CMD_REPLY_FUNC(whowas) +static void +silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, + SilcCommandStatus status) { + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcClient client = cmd->client; + SilcClientID *client_id = NULL; + SilcServerID *server_id = NULL; + SilcChannelID *channel_id = NULL; + SilcIDCacheEntry id_cache = NULL; + SilcClientEntry client_entry; + SilcServerEntry server_entry; + SilcChannelEntry channel_entry; + int argc; + uint32 len; + unsigned char *id_data; + char *name = NULL, *info = NULL; + SilcIDPayload idp = NULL; + SilcIdType id_type; + + argc = silc_argument_get_arg_num(cmd->args); -} + id_data = silc_argument_get_arg_type(cmd->args, 2, &len); + if (!id_data) { + COMMAND_REPLY_ERROR; + return; + } + idp = silc_id_payload_parse_data(id_data, len); + if (!idp) { + COMMAND_REPLY_ERROR; + return; + } -/* Received reply for IDENTIFY command. This maybe called several times - for one IDENTIFY command as server may reply with list of results. - This is totally silent and does not print anything on screen. */ + name = silc_argument_get_arg_type(cmd->args, 3, &len); + info = silc_argument_get_arg_type(cmd->args, 4, &len); -SILC_CLIENT_CMD_REPLY_FUNC(identify) -{ - SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; - SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SilcClientEntry client_entry; - SilcIDCacheEntry id_cache = NULL; - SilcCommandStatus status; - unsigned char *tmp; + id_type = silc_id_payload_get_type(idp); - SILC_LOG_DEBUG(("Start")); + switch (id_type) { + case SILC_ID_CLIENT: + client_id = silc_id_payload_get_id(idp); - tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); - SILC_GET16_MSB(status, tmp); - if (status != SILC_STATUS_OK) { - if (status == SILC_STATUS_ERR_NO_SUCH_NICK) { - /* Take nickname which may be provided */ - tmp = silc_argument_get_arg_type(cmd->args, 3, NULL); - if (tmp) - cmd->client->ops->say(cmd->client, conn, "%s: %s", tmp, - silc_client_command_status_message(status)); - else - cmd->client->ops->say(cmd->client, conn, "%s", - silc_client_command_status_message(status)); - COMMAND_REPLY_ERROR; - goto out; + 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 { - cmd->client->ops->say(cmd->client, conn, - "%s", silc_client_command_status_message(status)); - COMMAND_REPLY_ERROR; - goto out; + client_entry = (SilcClientEntry)id_cache->context; + silc_client_update_client(cmd->client, conn, client_entry, + name, info, NULL, 0); } - } - /* Display one whois reply */ - if (status == SILC_STATUS_OK) { - unsigned int len; - unsigned char *id_data; - char *nickname; - char *username; - SilcClientID *client_id; + /* Notify application */ + COMMAND_REPLY((ARGS, client_entry, name, info)); + break; - id_data = silc_argument_get_arg_type(cmd->args, 2, &len); - if (!id_data) - goto out; - client_id = silc_id_payload_parse_id(id_data, len); - - nickname = silc_argument_get_arg_type(cmd->args, 3, NULL); - username = silc_argument_get_arg_type(cmd->args, 4, NULL); - - if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id, - SILC_ID_CLIENT, &id_cache)) { - 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, - SILC_ID_CLIENT, client_id, (void *)client_entry, TRUE); + 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 { - 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_parse_nickname(nickname, &client_entry->nickname, - &client_entry->server, &client_entry->num); - - if (username) - client_entry->username = strdup(username); - silc_free(client_id); + server_entry = (SilcServerEntry)id_cache->context; } - } - if (status == SILC_STATUS_LIST_START) { + /* 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; - if (status == SILC_STATUS_LIST_END) { + 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; } - SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_IDENTIFY); + 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 + for one IDENTIFY command as server may reply with list of results. + This is totally silent and does not print anything on screen. */ + +SILC_CLIENT_CMD_REPLY_FUNC(identify) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcCommandStatus status; + + COMMAND_CHECK_STATUS_LIST; + + /* 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 && + status != SILC_STATUS_LIST_END) { + silc_client_command_reply_free(cmd); + return; + } out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY); silc_client_command_reply_free(cmd); } @@ -450,21 +549,22 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) SilcCommandStatus status; SilcIDPayload idp; unsigned char *tmp; - unsigned int argc, len; + uint32 argc, len; 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, "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; @@ -473,17 +573,52 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) /* Take received Client ID */ tmp = silc_argument_get_arg_type(cmd->args, 2, &len); idp = silc_id_payload_parse_data(tmp, len); + if (!idp) { + COMMAND_REPLY_ERROR; + goto out; + } silc_client_receive_new_id(cmd->client, cmd->sock, idp); /* Notify application */ COMMAND_REPLY((ARGS, conn->local_entry)); out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_NICK); silc_client_command_reply_free(cmd); } +/* Received reply to the LIST command. */ + SILC_CLIENT_CMD_REPLY_FUNC(list) { + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcCommandStatus status; + unsigned char *tmp, *name, *topic; + uint32 usercount = 0; + + COMMAND_CHECK_STATUS_LIST; + + name = silc_argument_get_arg_type(cmd->args, 3, NULL); + topic = silc_argument_get_arg_type(cmd->args, 4, NULL); + tmp = silc_argument_get_arg_type(cmd->args, 5, NULL); + if (tmp) + SILC_GET32_MSB(usercount, tmp); + + /* Notify application */ + COMMAND_REPLY((ARGS, NULL, name, topic, usercount)); + + /* Pending callbacks are not executed if this was an list entry */ + if (status != SILC_STATUS_OK && + status != SILC_STATUS_LIST_END) { + silc_client_command_reply_free(cmd); + return; + } + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LIST); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_LIST); + silc_client_command_reply_free(cmd); } /* Received reply to topic command. */ @@ -498,15 +633,14 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) SilcIDCacheEntry id_cache = NULL; unsigned char *tmp; char *topic; - unsigned int argc, len; + uint32 argc, 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; - silc_client_command_reply_free(cmd); - return; + goto out; } argc = silc_argument_get_arg_num(cmd->args); @@ -526,10 +660,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) goto out; channel_id = silc_id_payload_parse_id(tmp, len); + if (!channel_id) + goto out; - /* Get the channel name */ + /* 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; @@ -537,14 +673,12 @@ 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)); out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_TOPIC); silc_client_command_reply_free(cmd); } @@ -555,30 +689,75 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcCommandStatus status; + SilcChannelEntry channel; + SilcChannelID *channel_id; + SilcIDCacheEntry id_cache; unsigned char *tmp; + 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_command_reply_free(cmd); - return; + 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 the invite list */ + tmp = silc_argument_get_arg_type(cmd->args, 3, &len); /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((ARGS, channel, tmp)); + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INVITE); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INVITE); silc_client_command_reply_free(cmd); } - -SILC_CLIENT_CMD_REPLY_FUNC(quit) -{ -} +/* Received reply to the KILL command. */ + SILC_CLIENT_CMD_REPLY_FUNC(kill) { + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcCommandStatus status; + + 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, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); + COMMAND_REPLY_ERROR; + goto out; + } + + /* Notify application */ + COMMAND_REPLY((ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KILL); + silc_client_command_reply_free(cmd); } /* Received reply to INFO command. We receive the server ID and some @@ -588,43 +767,67 @@ 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_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 */ + 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, 3, 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); - out: - silc_client_command_reply_free(cmd); -} + /* 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)); -SILC_CLIENT_CMD_REPLY_FUNC(connect) -{ + 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); } /* Received reply to PING command. The reply time is shown to user. */ @@ -640,70 +843,77 @@ 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; } curtime = time(NULL); - id = silc_id_str2id(cmd->packet->src_id, cmd->packet->src_id_type); + id = silc_id_str2id(cmd->packet->src_id, cmd->packet->src_id_len, + cmd->packet->src_id_type); + if (!id) { + COMMAND_REPLY_ERROR; + goto out; + } for (i = 0; i < conn->ping_count; i++) { - if (!SILC_ID_SERVER_COMPARE(conn->ping[i].dest_id, id)) { + 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"); - + conn->ping[i].start_time = 0; silc_free(conn->ping[i].dest_id); conn->ping[i].dest_id = NULL; silc_free(conn->ping[i].dest_name); conn->ping[i].dest_name = NULL; - - /* Notify application */ - COMMAND_REPLY((ARGS)); break; } } silc_free(id); + /* Notify application */ + COMMAND_REPLY((ARGS)); + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_PING); silc_client_command_reply_free(cmd); } -SILC_CLIENT_CMD_REPLY_FUNC(oper) -{ -} - /* Received reply for JOIN command. */ SILC_CLIENT_CMD_REPLY_FUNC(join) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SilcClient client = cmd->client; SilcCommandStatus status; - SilcIDPayload idp; - unsigned int argc, mode, len; - char *topic, *tmp, *channel_name; + SilcIDPayload idp = NULL; + SilcChannelEntry channel; + SilcIDCacheEntry id_cache = NULL; + SilcChannelUser chu; + uint32 argc, mode, len, list_count; + char *topic, *tmp, *channel_name = NULL, *hmac; + 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; } argc = silc_argument_get_arg_num(cmd->args); - if (argc < 3 || argc > 5) { - cmd->client->ops->say(cmd->client, conn, + if (argc < 7 || argc > 14) { + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); COMMAND_REPLY_ERROR; goto out; @@ -712,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; @@ -722,38 +932,157 @@ 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); goto out; } idp = silc_id_payload_parse_data(tmp, len); + if (!idp) { + COMMAND_REPLY_ERROR; + silc_free(channel_name); + goto out; + } /* Get channel mode */ - tmp = silc_argument_get_arg_type(cmd->args, 4, NULL); + tmp = silc_argument_get_arg_type(cmd->args, 5, NULL); if (tmp) SILC_GET32_MSB(mode, tmp); else mode = 0; + /* Get channel key */ + tmp = silc_argument_get_arg_type(cmd->args, 7, &len); + if (tmp) { + keyp = silc_buffer_alloc(len); + silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp)); + silc_buffer_put(keyp, tmp, len); + } + /* Get topic */ - topic = silc_argument_get_arg_type(cmd->args, 5, NULL); + 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 */ - silc_client_new_channel_id(cmd->client, cmd->sock, channel_name, - mode, idp); + /* 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); - if (topic) - client->ops->say(cmd->client, conn, - "Topic for %s: %s", channel_name, topic); + 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, SILC_CLIENT_MESSAGE_ERROR, + "Cannot join channel: Unsupported HMAC `%s'", + hmac); + COMMAND_REPLY_ERROR; + silc_free(channel_name); + goto out; + } + } + + /* Get the list count */ + tmp = silc_argument_get_arg_type(cmd->args, 12, &len); + if (!tmp) + goto out; + SILC_GET32_MSB(list_count, tmp); + + /* Get Client ID list */ + tmp = silc_argument_get_arg_type(cmd->args, 13, &len); + if (!tmp) + goto out; + + client_id_list = silc_buffer_alloc(len); + silc_buffer_pull_tail(client_id_list, len); + silc_buffer_put(client_id_list, tmp, len); + + /* Get client mode list */ + tmp = silc_argument_get_arg_type(cmd->args, 14, &len); + if (!tmp) + goto out; + + client_mode_list = silc_buffer_alloc(len); + silc_buffer_pull_tail(client_mode_list, len); + silc_buffer_put(client_mode_list, tmp, len); + + /* Add clients we received in the reply to the channel */ + for (i = 0; i < list_count; i++) { + uint16 idp_len; + uint32 mode; + SilcClientID *client_id; + SilcClientEntry client_entry; + + /* Client ID */ + SILC_GET16_MSB(idp_len, client_id_list->data + 2); + idp_len += 4; + client_id = silc_id_payload_parse_id(client_id_list->data, idp_len); + if (!client_id) + continue; + + /* Mode */ + SILC_GET32_MSB(mode, client_mode_list->data); + + /* 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)) { + /* No, we don't have it, add entry for it. */ + 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; + } + + /* Join the client to the channel */ + chu = silc_calloc(1, sizeof(*chu)); + chu->client = client_entry; + chu->mode = mode; + silc_list_add(channel->clients, chu); + silc_free(client_id); + + silc_buffer_pull(client_id_list, idp_len); + silc_buffer_pull(client_mode_list, 4); + } + silc_buffer_push(client_id_list, client_id_list->data - + client_id_list->head); + silc_buffer_push(client_mode_list, client_mode_list->data - + client_mode_list->head); + + /* Save channel key */ + if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY)) + silc_client_save_channel_key(conn, keyp, channel); + + /* Client is now joined to the channel */ + channel->on_channel = TRUE; /* Notify application */ - COMMAND_REPLY((ARGS, channel_name, conn->current_channel, mode, - NULL, NULL, topic)); + COMMAND_REPLY((ARGS, channel_name, channel, mode, 0, + keyp ? keyp->head : NULL, NULL, + NULL, topic, hmac, list_count, client_id_list, + client_mode_list)); 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); + 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 */ @@ -763,27 +1092,27 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcCommandStatus status; - unsigned int argc, i; + uint32 argc, i; unsigned char *tmp; char *motd = NULL, *cp, line[256]; 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; } argc = silc_argument_get_arg_num(cmd->args); - if (argc > 2) { + if (argc > 3) { COMMAND_REPLY_ERROR; goto out; } - if (argc == 2) { - motd = silc_argument_get_arg_type(cmd->args, 2, NULL); + if (argc == 3) { + motd = silc_argument_get_arg_type(cmd->args, 3, NULL); if (!motd) { COMMAND_REPLY_ERROR; goto out; @@ -800,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; @@ -813,11 +1143,46 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) COMMAND_REPLY((ARGS, motd)); out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_MOTD); silc_client_command_reply_free(cmd); } +/* Received reply tot he UMODE command. Save the current user mode */ + SILC_CLIENT_CMD_REPLY_FUNC(umode) { + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcCommandStatus status; + unsigned char *tmp; + uint32 mode; + + 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, 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, NULL); + if (!tmp) { + COMMAND_REPLY_ERROR; + goto out; + } + + SILC_GET32_MSB(mode, tmp); + conn->local_entry->mode = mode; + + /* Notify application */ + COMMAND_REPLY((ARGS, mode)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_UMODE); + silc_client_command_reply_free(cmd); } /* Received reply for CMODE command. */ @@ -828,26 +1193,58 @@ 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)); + + 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); } @@ -860,67 +1257,295 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) SilcCommandStatus status; SilcIDCacheEntry id_cache = NULL; SilcClientID *client_id; - unsigned char *tmp, *id; - unsigned int 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); out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CUMODE); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CUMODE); silc_client_command_reply_free(cmd); } SILC_CLIENT_CMD_REPLY_FUNC(kick) { + 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); + if (status != SILC_STATUS_OK) { + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); + COMMAND_REPLY_ERROR; + goto out; + } + + /* Notify application */ + COMMAND_REPLY((ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KICK); + silc_client_command_reply_free(cmd); } -SILC_CLIENT_CMD_REPLY_FUNC(restart) +SILC_CLIENT_CMD_REPLY_FUNC(silcoper) { + 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); + if (status != SILC_STATUS_OK) { + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); + COMMAND_REPLY_ERROR; + goto out; + } + + /* Notify application */ + COMMAND_REPLY((ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SILCOPER); + silc_client_command_reply_free(cmd); } - -SILC_CLIENT_CMD_REPLY_FUNC(close) + +SILC_CLIENT_CMD_REPLY_FUNC(oper) { + 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); + if (status != SILC_STATUS_OK) { + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); + COMMAND_REPLY_ERROR; + goto out; + } + + /* Notify application */ + COMMAND_REPLY((ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_OPER); + silc_client_command_reply_free(cmd); } - -SILC_CLIENT_CMD_REPLY_FUNC(die) + +SILC_CLIENT_CMD_REPLY_FUNC(connect) { + 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); + if (status != SILC_STATUS_OK) { + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); + COMMAND_REPLY_ERROR; + goto out; + } + + /* Notify application */ + COMMAND_REPLY((ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CONNECT); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CONNECT); + silc_client_command_reply_free(cmd); } - -SILC_CLIENT_CMD_REPLY_FUNC(silcoper) + +SILC_CLIENT_CMD_REPLY_FUNC(ban) { + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcCommandStatus status; + SilcIDCacheEntry id_cache = NULL; + SilcChannelEntry channel; + SilcChannelID *channel_id; + unsigned char *tmp; + 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, 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 the ban list */ + tmp = silc_argument_get_arg_type(cmd->args, 3, &len); + + /* Notify application */ + COMMAND_REPLY((ARGS, channel, tmp)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_BAN); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_BAN); + silc_client_command_reply_free(cmd); } +SILC_CLIENT_CMD_REPLY_FUNC(close) +{ + 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); + if (status != SILC_STATUS_OK) { + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); + COMMAND_REPLY_ERROR; + goto out; + } + + /* Notify application */ + COMMAND_REPLY((ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CLOSE); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CLOSE); + silc_client_command_reply_free(cmd); +} + +SILC_CLIENT_CMD_REPLY_FUNC(shutdown) +{ + 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); + if (status != SILC_STATUS_OK) { + cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); + COMMAND_REPLY_ERROR; + goto out; + } + + /* Notify application */ + COMMAND_REPLY((ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SHUTDOWN); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SHUTDOWN); + silc_client_command_reply_free(cmd); +} + /* Reply to LEAVE command. */ SILC_CLIENT_CMD_REPLY_FUNC(leave) @@ -933,22 +1558,25 @@ 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; - return; + goto out; } /* Notify application */ COMMAND_REPLY((ARGS)); + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_LEAVE); silc_client_command_reply_free(cmd); } -/* Reply to NAMES command. Received list of client names on the channel - we requested. */ +/* Reply to USERS command. Received list of client ID's and theirs modes + on the channel we requested. */ -SILC_CLIENT_CMD_REPLY_FUNC(names) +SILC_CLIENT_CMD_REPLY_FUNC(users) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; @@ -957,84 +1585,82 @@ SILC_CLIENT_CMD_REPLY_FUNC(names) 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; - char *name_list, *cp; - int i, k, len1, len2, list_count = 0; + uint32 tmp_len, list_count; + int i; + unsigned char **res_argv = NULL; + uint32 *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0; SILC_LOG_DEBUG(("Start")); 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; } /* Get channel ID */ - tmp = silc_argument_get_arg_type(cmd->args, 2, &len1); + tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len); if (!tmp) { - cmd->client->ops->say(cmd->client, conn, - "Cannot Channel ID: Bad reply packet"); COMMAND_REPLY_ERROR; goto out; } - channel_id = silc_id_payload_parse_id(tmp, len1); - - /* Get the name list of the channel */ - name_list = silc_argument_get_arg_type(cmd->args, 3, &len1); - if (!name_list) { - cmd->client->ops->say(cmd->client, conn, - "Cannot get user list: Bad reply packet"); + channel_id = silc_id_payload_parse_id(tmp, tmp_len); + 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) { + COMMAND_REPLY_ERROR; + goto out; + } + SILC_GET32_MSB(list_count, tmp); /* Get Client ID list */ - tmp = silc_argument_get_arg_type(cmd->args, 4, &len2); + tmp = silc_argument_get_arg_type(cmd->args, 4, &tmp_len); if (!tmp) { - cmd->client->ops->say(cmd->client, conn, - "Cannot get user list: Bad reply packet"); COMMAND_REPLY_ERROR; goto out; } - client_id_list = silc_buffer_alloc(len2); - silc_buffer_pull_tail(client_id_list, len2); - silc_buffer_put(client_id_list, tmp, len2); + client_id_list = silc_buffer_alloc(tmp_len); + silc_buffer_pull_tail(client_id_list, tmp_len); + silc_buffer_put(client_id_list, tmp, tmp_len); /* Get client mode list */ - tmp = silc_argument_get_arg_type(cmd->args, 5, &len2); + tmp = silc_argument_get_arg_type(cmd->args, 5, &tmp_len); if (!tmp) { - cmd->client->ops->say(cmd->client, conn, - "Cannot get user list: Bad reply packet"); COMMAND_REPLY_ERROR; goto out; } - client_mode_list = silc_buffer_alloc(len2); - silc_buffer_pull_tail(client_mode_list, len2); - silc_buffer_put(client_mode_list, tmp, len2); + client_mode_list = silc_buffer_alloc(tmp_len); + silc_buffer_pull_tail(client_mode_list, tmp_len); + silc_buffer_put(client_mode_list, tmp, tmp_len); - /* Get the channel name */ + /* 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 commas from list */ - for (i = 0; i < len1; i++) - if (name_list[i] == ',') { - name_list[i] = ' '; - list_count++; - } - list_count++; /* Remove old client list from channel. */ silc_list_start(channel->clients); @@ -1043,178 +1669,207 @@ SILC_CLIENT_CMD_REPLY_FUNC(names) silc_free(chu); } - /* Cache the received name list, 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. */ - cp = name_list; + /* Cache the received Client ID's and modes. */ for (i = 0; i < list_count; i++) { - int nick_len = strcspn(name_list, " "); - unsigned short idp_len; - unsigned int mode; - char *nickname = silc_calloc(nick_len + 1, sizeof(*nickname)); + uint16 idp_len; + uint32 mode; SilcClientID *client_id; SilcClientEntry client; - memcpy(nickname, name_list, nick_len); + /* Client ID */ SILC_GET16_MSB(idp_len, client_id_list->data + 2); idp_len += 4; client_id = silc_id_payload_parse_id(client_id_list->data, idp_len); - silc_buffer_pull(client_id_list, idp_len); - + if (!client_id) + continue; + + /* Mode */ SILC_GET32_MSB(mode, client_mode_list->data); - silc_buffer_pull(client_mode_list, 4); /* 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)) { - client = silc_calloc(1, sizeof(*client)); - client->id = client_id; - silc_parse_nickname(nickname, &client->nickname, &client->server, - &client->num); - silc_free(nickname); - - /* Add client to cache */ - silc_idcache_add(conn->client_cache, client->nickname, SILC_ID_CLIENT, - client_id, (void *)client, TRUE); + 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) * + (res_argc + 1)); + res_argv_types = silc_realloc(res_argv_types, sizeof(*res_argv_types) * + (res_argc + 1)); + res_argv[res_argc] = client_id_list->data; + res_argv_lens[res_argc] = idp_len; + res_argv_types[res_argc] = res_argc + 3; + res_argc++; } else { + /* Found the client, join it to the channel */ client = (SilcClientEntry)id_cache->context; + chu = silc_calloc(1, sizeof(*chu)); + chu->client = client; + chu->mode = mode; + silc_list_add(channel->clients, chu); + silc_free(client_id); - silc_free(nickname); id_cache = NULL; } - chu = silc_calloc(1, sizeof(*chu)); - chu->client = client; - chu->mode = mode; - silc_list_add(channel->clients, chu); - - name_list += nick_len + 1; + silc_buffer_pull(client_id_list, idp_len); + silc_buffer_pull(client_mode_list, 4); } - name_list = cp; - for (i = 0; i < list_count; i++) { - int c = 0; - int nick_len = strcspn(name_list, " "); - char *nickname = silc_calloc(nick_len + 1, sizeof(*nickname)); - memcpy(nickname, name_list, nick_len); - - silc_list_start(channel->clients); - while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) { - if (!strncmp(chu->client->nickname, nickname, - strlen(chu->client->nickname))) { - char t[8]; - - if (!c) { - c++; - continue; - } - - memset(t, 0, sizeof(t)); - chu->client->nickname = silc_calloc(strlen(nickname) + 8, 1); - snprintf(t, sizeof(t), "[%d]", c++); - strncat(chu->client->nickname, t, strlen(t)); - strncat(chu->client->nickname, nickname, strlen(nickname)); - } - } - - silc_free(nickname); + /* Query the client information from server if the list included clients + that we don't know about. */ + if (res_argc) { + SilcBuffer res_cmd; + + /* 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 WHOIS + command reply we will reprocess this command reply by re-calling this + USERS command reply callback. */ + silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident, + NULL, silc_client_command_reply_users, cmd); + + silc_buffer_free(res_cmd); + if (channel_id) + silc_free(channel_id); + + silc_free(res_argv); + silc_free(res_argv_lens); + silc_free(res_argv_types); + return; } - /* XXX hmm... actually it is applications business to display this - information. We should just pass (as we do) the data to application and - let it to parse it and display it the way it wants. */ - if (cmd->callback) { - cmd->client->ops->say(cmd->client, conn, "Users on %s", - channel->channel_name); - - silc_list_start(channel->clients); - while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) { - SilcClientEntry e = chu->client; - char *m, tmp[80], line[80]; - - memset(line, 0, sizeof(line)); - memset(tmp, 0, sizeof(tmp)); - m = silc_client_chumode_char(chu->mode); - - strcat(line, " "); - strcat(line, e->nickname); - strcat(line, e->server ? "@" : ""); - - len1 = 0; - if (e->server) - len1 = strlen(e->server); - strncat(line, e->server ? e->server : "", len1 > 30 ? 30 : len1); - - len1 = strlen(line); - if (len1 >= 30) { - memset(&line[29], 0, len1 - 29); - } else { - for (i = 0; i < 30 - len1 - 1; i++) - strcat(line, " "); - } + /* Notify application */ + COMMAND_REPLY((ARGS, channel, list_count, client_id_list, client_mode_list)); - strcat(line, " H"); - strcat(tmp, m ? m : ""); - strcat(line, tmp); + out: + 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); +} - if (strlen(tmp) < 5) - for (i = 0; i < 5 - strlen(tmp); i++) - strcat(line, " "); +/* Received command reply to GETKEY command. WE've received the remote + client's public key. */ - strcat(line, e->username ? e->username : ""); +SILC_CLIENT_CMD_REPLY_FUNC(getkey) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcCommandStatus status; + SilcIDCacheEntry id_cache; + 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; + uint16 pk_len; + SilcIdType id_type; + SilcPublicKey public_key = NULL; - cmd->client->ops->say(cmd->client, conn, "%s", line); + SILC_LOG_DEBUG(("Start")); - if (m) - silc_free(m); - } + 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, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); + COMMAND_REPLY_ERROR; + goto out; + } - } else { - name_list = NULL; - len1 = 0; - k = 0; - - silc_list_start(channel->clients); - while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) { - char *m, *n = chu->client->nickname; - len2 = strlen(n); - len1 += len2; - - name_list = silc_realloc(name_list, sizeof(*name_list) * (len1 + 3)); - - m = silc_client_chumode_char(chu->mode); - if (m) { - memcpy(name_list + (len1 - len2), m, strlen(m)); - len1 += strlen(m); - silc_free(m); - } + tmp = silc_argument_get_arg_type(cmd->args, 2, &len); + if (!tmp) { + COMMAND_REPLY_ERROR; + goto out; + } + idp = silc_id_payload_parse_data(tmp, len); + if (!idp) { + COMMAND_REPLY_ERROR; + goto out; + } - memcpy(name_list + (len1 - len2), n, len2); - name_list[len1] = 0; - - if (k == silc_list_count(channel->clients) - 1) - break; - memcpy(name_list + len1, " ", 1); - len1++; - k++; + /* Get the public key payload */ + tmp = silc_argument_get_arg_type(cmd->args, 3, &len); + 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_ext(conn->client_cache, + (void *)client_id, + NULL, NULL, + silc_hash_client_id_compare, NULL, + &id_cache)) { + COMMAND_REPLY_ERROR; + goto out; } - cmd->client->ops->say(cmd->client, conn, "Users on %s: %s", - channel->channel_name, name_list); - silc_free(name_list); - } + client_entry = (SilcClientEntry)id_cache->context; - name_list = silc_argument_get_arg_type(cmd->args, 3, &len1); + /* Notify application */ + COMMAND_REPLY((ARGS, id_type, client_entry, public_key)); + } else if (id_type == SILC_ID_SERVER) { + /* 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; + } - /* Notify application */ - COMMAND_REPLY((ARGS, channel, name_list, client_id_list->head, - client_mode_list->head)); + server_entry = (SilcServerEntry)id_cache->context; - silc_buffer_free(client_id_list); - silc_buffer_free(client_mode_list); + /* Notify application */ + COMMAND_REPLY((ARGS, id_type, server_entry, public_key)); + } out: - if (channel_id) - silc_free(channel_id); + 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); }