X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand_reply.c;h=f66c19dd64f1ff5f69c6287eb4cf79f311a23707;hb=6394d86063413bc1c473723f3ef971840195bcd3;hp=61bade4bbce963df43c4e7fef712ae50d76329da;hpb=011072dfc9cd98d8de2a1ae0d7be260118506635;p=silc.git diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c index 61bade4b..f66c19dd 100644 --- a/lib/silcclient/command_reply.c +++ b/lib/silcclient/command_reply.c @@ -1,22 +1,22 @@ /* - command_reply.c + command_reply.c - Author: Pekka Riikonen + Author: 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + the Free Software Foundation; version 2 of the License. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ +/* $Id$ */ /* * Command reply functions are "the otherside" of the command functions. * Reply to a command sent by server is handled by these functions. @@ -31,43 +31,10 @@ * necessary data already in hand without redundant searching. If ID is * received but ID entry does not exist, NULL is sent. */ -/* $Id$ */ #include "clientlibincludes.h" #include "client_internal.h" -/* Client command reply list. */ -SilcClientCommandReply silc_command_reply_list[] = -{ - SILC_CLIENT_CMD_REPLY(whois, WHOIS), - SILC_CLIENT_CMD_REPLY(whowas, WHOWAS), - SILC_CLIENT_CMD_REPLY(identify, IDENTIFY), - SILC_CLIENT_CMD_REPLY(nick, NICK), - SILC_CLIENT_CMD_REPLY(list, LIST), - SILC_CLIENT_CMD_REPLY(topic, TOPIC), - SILC_CLIENT_CMD_REPLY(invite, INVITE), - SILC_CLIENT_CMD_REPLY(kill, KILL), - SILC_CLIENT_CMD_REPLY(info, INFO), - SILC_CLIENT_CMD_REPLY(connect, CONNECT), - SILC_CLIENT_CMD_REPLY(ping, PING), - SILC_CLIENT_CMD_REPLY(oper, OPER), - SILC_CLIENT_CMD_REPLY(join, JOIN), - SILC_CLIENT_CMD_REPLY(motd, MOTD), - SILC_CLIENT_CMD_REPLY(umode, UMODE), - SILC_CLIENT_CMD_REPLY(cmode, CMODE), - SILC_CLIENT_CMD_REPLY(cumode, CUMODE), - SILC_CLIENT_CMD_REPLY(kick, KICK), - SILC_CLIENT_CMD_REPLY(ban, BAN), - SILC_CLIENT_CMD_REPLY(close, CLOSE), - SILC_CLIENT_CMD_REPLY(shutdown, SHUTDOWN), - SILC_CLIENT_CMD_REPLY(silcoper, SILCOPER), - SILC_CLIENT_CMD_REPLY(leave, LEAVE), - SILC_CLIENT_CMD_REPLY(users, USERS), - SILC_CLIENT_CMD_REPLY(getkey, GETKEY), - - { NULL, 0 }, -}; - const SilcCommandStatusMessage silc_command_status_messages[] = { { STAT(NO_SUCH_NICK), "There was no such nickname" }, @@ -113,14 +80,40 @@ const SilcCommandStatusMessage silc_command_status_messages[] = { }; /* 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 -#define ARGS cmd->client, cmd->sock->user_data, \ +#define COMMAND_REPLY(args) cmd->client->internal->ops->command_reply args +#define ARGS cmd->client, cmd->sock->user_data, \ cmd->payload, TRUE, silc_command_get(cmd->payload), status /* Error reply to application. Usage: COMMAND_REPLY_ERROR; */ -#define COMMAND_REPLY_ERROR cmd->client->ops->command_reply(cmd->client, \ - cmd->sock->user_data, cmd->payload, FALSE, \ - silc_command_get(cmd->payload), status) +#define COMMAND_REPLY_ERROR cmd->client->internal->ops-> \ + command_reply(cmd->client, 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. */ @@ -129,14 +122,14 @@ void silc_client_command_reply_process(SilcClient client, SilcPacketContext *packet) { SilcBuffer buffer = packet->buffer; - SilcClientCommandReply *cmd; + SilcClientCommand cmd; SilcClientCommandReplyContext ctx; SilcCommandPayload payload; SilcCommand command; - uint16 ident; - + SilcCommandCb reply = NULL; + /* Get command reply payload from packet */ - payload = silc_command_payload_parse(buffer); + payload = silc_command_payload_parse(buffer->data, buffer->len); if (!payload) { /* Silently ignore bad reply packet */ SILC_LOG_DEBUG(("Bad command reply packet")); @@ -151,24 +144,35 @@ 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); - + ctx->ident = silc_command_get_ident(ctx->payload); + /* Check for pending commands and mark to be exeucted */ silc_client_command_pending_check(sock->user_data, ctx, - silc_command_get(ctx->payload), ident); + silc_command_get(ctx->payload), + ctx->ident); /* Execute command reply */ + 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; + /* Try to find matching the command identifier */ + silc_list_start(client->internal->commands); + while ((cmd = silc_list_get(client->internal->commands)) != SILC_LIST_END) { + if (cmd->cmd == command && !cmd->ident) + reply = cmd->reply; + if (cmd->cmd == command && cmd->ident == ctx->ident) { + (*cmd->reply)((void *)ctx, NULL); + break; + } } - cmd->cb(ctx, NULL); + if (cmd == SILC_LIST_END) { + if (reply) + /* No specific identifier for command reply, call first one found */ + (*reply)(ctx, NULL); + else + silc_free(ctx); + } } /* Returns status message string */ @@ -200,7 +204,8 @@ void silc_client_command_reply_free(SilcClientCommandReplyContext cmd) static void silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, - SilcCommandStatus status) + SilcCommandStatus status, + bool notify) { SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcClientID *client_id; @@ -213,18 +218,22 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, char *realname = NULL; uint32 idle = 0, mode = 0; SilcBuffer channels = NULL; + unsigned char *fingerprint; + uint32 fingerprint_len; 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; + if (notify) + COMMAND_REPLY_ERROR; return; } client_id = silc_id_payload_parse_id(id_data, len); if (!client_id) { - COMMAND_REPLY_ERROR; + if (notify) + COMMAND_REPLY_ERROR; return; } @@ -232,7 +241,8 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, username = silc_argument_get_arg_type(cmd->args, 4, &len); realname = silc_argument_get_arg_type(cmd->args, 5, &len); if (!nickname || !username || !realname) { - COMMAND_REPLY_ERROR; + if (notify) + COMMAND_REPLY_ERROR; return; } @@ -251,56 +261,39 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, if (tmp) SILC_GET32_MSB(idle, tmp); + fingerprint = silc_argument_get_arg_type(cmd->args, 9, &fingerprint_len); + /* 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_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, - client_id, (void *)client_entry, 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); - - /* Remove the old cache entry and create a new one */ - silc_idcache_del_by_context(conn->client_cache, client_entry); - silc_idcache_add(conn->client_cache, client_entry->nickname, - client_entry->id, client_entry, FALSE); + silc_client_update_client(cmd->client, conn, client_entry, + nickname, username, realname, mode); silc_free(client_id); } + if (fingerprint && !client_entry->fingerprint) { + client_entry->fingerprint = + silc_calloc(fingerprint_len, + sizeof(*client_entry->fingerprint)); + memcpy(client_entry->fingerprint, fingerprint, fingerprint_len); + client_entry->fingerprint_len = fingerprint_len; + } + + if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) + client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; + /* Notify application */ - if (!cmd->callback) + if (!cmd->callback && notify) COMMAND_REPLY((ARGS, client_entry, nickname, username, realname, - channels, mode, idle)); + channels, mode, idle, fingerprint)); if (channels) silc_buffer_free(channels); @@ -312,30 +305,13 @@ silc_client_command_reply_whois_save(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 && - 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); - - /* 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, TRUE); /* Pending callbacks are not executed if this was an list entry */ if (status != SILC_STATUS_OK && @@ -344,11 +320,30 @@ 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); + + /* If we received notify for invalid ID we'll remove the ID if we + have it cached. */ + if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + SilcClientEntry client_entry; + uint32 tmp_len; + unsigned char *tmp = + silc_argument_get_arg_type(silc_command_get_args(cmd->payload), + 2, &tmp_len); + if (tmp) { + SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len); + if (client_id) { + client_entry = silc_client_get_client_by_id(cmd->client, conn, + client_id); + if (client_entry) + silc_client_del_client(cmd->client, conn, client_entry); + silc_free(client_id); + } + } + } + silc_client_command_reply_free(cmd); } @@ -363,32 +358,22 @@ 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 */ @@ -404,8 +389,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. */ @@ -418,17 +404,16 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) return; } - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); - out: - SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS); + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOWAS); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOWAS); silc_client_command_reply_free(cmd); } static void silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, - SilcCommandStatus status) + SilcCommandStatus status, + bool notify) { SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcClient client = cmd->client; @@ -450,12 +435,14 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, id_data = silc_argument_get_arg_type(cmd->args, 2, &len); if (!id_data) { - COMMAND_REPLY_ERROR; + if (notify) + COMMAND_REPLY_ERROR; return; } - idp = silc_id_payload_parse_data(id_data, len); + idp = silc_id_payload_parse(id_data, len); if (!idp) { - COMMAND_REPLY_ERROR; + if (notify) + COMMAND_REPLY_ERROR; return; } @@ -477,42 +464,21 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, 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 = silc_id_dup(client_id, id_type); - silc_parse_nickname(name, &client_entry->nickname, - &client_entry->server, &client_entry->num); - if (info) - client_entry->username = strdup(info); - - /* Add client to cache */ - silc_idcache_add(conn->client_cache, client_entry->nickname, - client_entry->id, (void *)client_entry, FALSE); + 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; - if (client_entry->nickname) - silc_free(client_entry->nickname); - if (client_entry->server) - silc_free(client_entry->server); - if (info && client_entry->username) - silc_free(client_entry->username); - - SILC_LOG_DEBUG(("Updating client entry")); - - silc_parse_nickname(name, &client_entry->nickname, - &client_entry->server, &client_entry->num); - - if (info) - client_entry->username = strdup(info); - - /* Remove the old cache entry and create a new one */ - silc_idcache_del_by_context(conn->client_cache, client_entry); - silc_idcache_add(conn->client_cache, client_entry->nickname, - client_entry->id, client_entry, FALSE); + silc_client_update_client(cmd->client, conn, client_entry, + name, info, NULL, 0); } + if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) + client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; + /* Notify application */ - COMMAND_REPLY((ARGS, client_entry, name, info)); + if (notify) + COMMAND_REPLY((ARGS, client_entry, name, info)); break; case SILC_ID_SERVER: @@ -534,13 +500,15 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, /* Add server to cache */ silc_idcache_add(conn->server_cache, server_entry->server_name, - server_entry->server_id, (void *)server_entry, FALSE); + server_entry->server_id, (void *)server_entry, + 0, NULL); } else { server_entry = (SilcServerEntry)id_cache->context; } /* Notify application */ - COMMAND_REPLY((ARGS, server_entry, name, info)); + if (notify) + COMMAND_REPLY((ARGS, server_entry, name, info)); break; case SILC_ID_CHANNEL: @@ -562,7 +530,8 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, } /* Notify application */ - COMMAND_REPLY((ARGS, channel_entry, name, info)); + if (notify) + COMMAND_REPLY((ARGS, channel_entry, name, info)); break; } @@ -579,30 +548,13 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, SILC_CLIENT_CMD_REPLY_FUNC(identify) { 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 && - 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); - - /* 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, TRUE); /* Pending callbacks are not executed if this was an list entry */ if (status != SILC_STATUS_OK && @@ -611,11 +563,30 @@ 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); + + /* If we received notify for invalid ID we'll remove the ID if we + have it cached. */ + if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + SilcClientEntry client_entry; + uint32 tmp_len; + unsigned char *tmp = + silc_argument_get_arg_type(silc_command_get_args(cmd->payload), + 2, &tmp_len); + if (tmp) { + SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len); + if (client_id) { + client_entry = silc_client_get_client_by_id(cmd->client, conn, + client_id); + if (client_entry) + silc_client_del_client(cmd->client, conn, client_entry); + silc_free(client_id); + } + } + } + silc_client_command_reply_free(cmd); } @@ -635,16 +606,18 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "Cannot set nickname: %s", - silc_client_command_status_message(status)); + cmd->client->internal->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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot set nickname: bad reply to command"); COMMAND_REPLY_ERROR; goto out; @@ -652,7 +625,7 @@ 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); + idp = silc_id_payload_parse(tmp, len); if (!idp) { COMMAND_REPLY_ERROR; goto out; @@ -660,12 +633,14 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) silc_client_receive_new_id(cmd->client, cmd->sock, idp); /* Notify application */ - COMMAND_REPLY((ARGS, conn->local_entry)); - - /* Execute any pending command callbacks */ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK); + COMMAND_REPLY((ARGS, conn->local_entry)); + SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_NICK); + silc_client_command_reply_free(cmd); + return; out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_NICK); silc_client_command_reply_free(cmd); } @@ -679,15 +654,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); @@ -705,10 +672,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); } @@ -729,12 +694,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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->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); @@ -770,10 +733,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(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); } @@ -794,12 +755,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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->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 */ @@ -827,10 +786,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); } @@ -842,12 +799,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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -856,10 +811,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); } @@ -879,15 +832,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) char *server_name, *server_info; uint32 len; + 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->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 */ @@ -921,7 +877,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) /* Add it to the cache */ silc_idcache_add(conn->server_cache, server->server_name, - server->server_id, (void *)server, FALSE); + server->server_id, (void *)server, 0, NULL); } else { server = (SilcServerEntry)id_cache->context; } @@ -929,13 +885,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) /* Notify application */ COMMAND_REPLY((ARGS, server, server->server_name, server->server_info)); - /* Execute any pending command callbacks */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO); - out: - if (server_id) - silc_free(server_id); + 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); } @@ -952,7 +905,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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -961,15 +914,17 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) curtime = time(NULL); id = silc_id_str2id(cmd->packet->src_id, cmd->packet->src_id_len, cmd->packet->src_id_type); - if (!id) { + if (!id || !conn->ping) { COMMAND_REPLY_ERROR; goto out; } for (i = 0; i < conn->ping_count; i++) { + if (!conn->ping[i].dest_id) + continue; 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, SILC_CLIENT_MESSAGE_INFO, + cmd->client->internal->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"); @@ -988,10 +943,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); } @@ -1009,22 +962,23 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + if (status != SILC_STATUS_ERR_USER_ON_CHANNEL) + cmd->client->internal->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 < 7 || argc > 14) { - cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); COMMAND_REPLY_ERROR; goto out; @@ -1033,7 +987,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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); COMMAND_REPLY_ERROR; goto out; @@ -1043,13 +997,13 @@ 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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->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); + idp = silc_id_payload_parse(tmp, len); if (!idp) { COMMAND_REPLY_ERROR; silc_free(channel_name); @@ -1074,6 +1028,11 @@ 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); @@ -1085,7 +1044,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) 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, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Unsupported HMAC `%s'", hmac); COMMAND_REPLY_ERROR; @@ -1142,10 +1101,9 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) 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, client_entry->id, - (void *)client_entry, 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; @@ -1179,17 +1137,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 */ @@ -1206,7 +1164,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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; return; @@ -1236,7 +1194,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) if (i == 2) line[0] = ' '; - cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", line); if (!strlen(cp)) @@ -1249,10 +1207,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); } @@ -1270,7 +1226,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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1288,10 +1244,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); } @@ -1312,7 +1266,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) 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, + cmd->client->internal->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; @@ -1350,12 +1304,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) /* Notify application */ COMMAND_REPLY((ARGS, channel, mode)); - silc_free(channel_id); - /* 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); } @@ -1373,20 +1326,20 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) SilcClientEntry client_entry; SilcChannelEntry channel; SilcChannelUser chu; - unsigned char *tmp, *id; + 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, SILC_CLIENT_MESSAGE_ERROR, + cmd->client->internal->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; } @@ -1437,7 +1390,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) client_entry = (SilcClientEntry)id_cache->context; /* Save the mode */ - SILC_GET32_MSB(mode, tmp); + 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; @@ -1450,10 +1404,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) 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); } @@ -1468,8 +1420,9 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1477,10 +1430,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); } @@ -1495,8 +1446,9 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1504,10 +1456,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); } @@ -1522,8 +1472,10 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, + SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1531,10 +1483,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); } @@ -1549,8 +1499,9 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1558,10 +1509,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); } @@ -1580,8 +1529,9 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1611,10 +1561,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); } @@ -1629,8 +1577,9 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1638,10 +1587,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); } @@ -1656,8 +1603,9 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1665,10 +1613,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); } @@ -1685,8 +1631,9 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1694,10 +1641,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); } @@ -1714,8 +1659,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; @@ -1727,8 +1672,9 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->ops->say( + cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_client_command_status_message(status)); COMMAND_REPLY_ERROR; goto out; } @@ -1823,7 +1769,19 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) silc_hash_client_id_compare, NULL, &id_cache); - if (!id_cache || !((SilcClientEntry)id_cache->context)->username) { + if (!id_cache || !((SilcClientEntry)id_cache->context)->username || + !((SilcClientEntry)id_cache->context)->realname) { + + if (id_cache && id_cache->context) { + SilcClientEntry client_entry = (SilcClientEntry)id_cache->context; + if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) { + silc_buffer_pull(client_id_list, idp_len); + silc_buffer_pull(client_mode_list, 4); + continue; + } + client_entry->status |= SILC_CLIENT_STATUS_RESOLVING; + } + /* 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. */ @@ -1859,9 +1817,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) SilcBuffer res_cmd; /* Send the WHOIS command to server */ + silc_client_command_register(cmd->client, SILC_COMMAND_WHOIS, NULL, NULL, + silc_client_command_reply_whois_i, 0, + ++conn->cmd_ident); res_cmd = silc_command_payload_encode(SILC_COMMAND_WHOIS, res_argc, res_argv, res_argv_lens, - res_argv_types, ++conn->cmd_ident); + 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); @@ -1885,17 +1846,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 @@ -1924,18 +1883,22 @@ 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, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); + cmd->client->internal->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) + } + idp = silc_id_payload_parse(tmp, len); + if (!idp) { + COMMAND_REPLY_ERROR; goto out; + } /* Get the public key payload */ tmp = silc_argument_get_arg_type(cmd->args, 3, &len); @@ -1945,11 +1908,15 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) SILC_GET16_MSB(type, tmp + 2); pk = tmp + 4; - if (type != SILC_SKE_PK_TYPE_SILC) + if (type != SILC_SKE_PK_TYPE_SILC) { + COMMAND_REPLY_ERROR; goto out; + } - if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key)) + if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key)) { + COMMAND_REPLY_ERROR; goto out; + } } id_type = silc_id_payload_get_type(idp); @@ -1960,8 +1927,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) (void *)client_id, NULL, NULL, silc_hash_client_id_compare, NULL, - &id_cache)) + &id_cache)) { + COMMAND_REPLY_ERROR; goto out; + } client_entry = (SilcClientEntry)id_cache->context; @@ -1971,8 +1940,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) /* 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)) + &id_cache)) { + COMMAND_REPLY_ERROR; goto out; + } server_entry = (SilcServerEntry)id_cache->context; @@ -1981,6 +1952,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) } out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_GETKEY); SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_GETKEY); if (idp) silc_id_payload_free(idp); @@ -1990,3 +1962,188 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) silc_free(server_id); silc_client_command_reply_free(cmd); } + +SILC_CLIENT_CMD_REPLY_FUNC(quit) +{ + silc_client_command_reply_free(context); +} + + +/****************************************************************************** + + Internal command reply functions + +******************************************************************************/ + +SILC_CLIENT_CMD_REPLY_FUNC(whois_i) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcCommandStatus status; + + 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) + goto out; + + /* Save WHOIS info */ + silc_client_command_reply_whois_save(cmd, status, FALSE); + + /* 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); + + /* If we received notify for invalid ID we'll remove the ID if we + have it cached. */ + if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + SilcClientEntry client_entry; + uint32 tmp_len; + unsigned char *tmp = + silc_argument_get_arg_type(silc_command_get_args(cmd->payload), + 2, &tmp_len); + if (tmp) { + SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len); + if (client_id) { + client_entry = silc_client_get_client_by_id(cmd->client, conn, + client_id); + if (client_entry) + silc_client_del_client(cmd->client, conn, client_entry); + silc_free(client_id); + } + } + } + + /* Unregister this command reply */ + silc_client_command_unregister(cmd->client, SILC_COMMAND_WHOIS, + NULL, silc_client_command_reply_whois_i, + cmd->ident); + + silc_client_command_reply_free(cmd); +} + +SILC_CLIENT_CMD_REPLY_FUNC(identify_i) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcCommandStatus status; + + 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) + goto out; + + /* Save IDENTIFY info */ + silc_client_command_reply_identify_save(cmd, status, FALSE); + + /* 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); + + /* If we received notify for invalid ID we'll remove the ID if we + have it cached. */ + if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + SilcClientEntry client_entry; + uint32 tmp_len; + unsigned char *tmp = + silc_argument_get_arg_type(silc_command_get_args(cmd->payload), + 2, &tmp_len); + if (tmp) { + SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len); + if (client_id) { + client_entry = silc_client_get_client_by_id(cmd->client, conn, + client_id); + if (client_entry) + silc_client_del_client(cmd->client, conn, client_entry); + silc_free(client_id); + } + } + } + + /* Unregister this command reply */ + silc_client_command_unregister(cmd->client, SILC_COMMAND_IDENTIFY, + NULL, silc_client_command_reply_identify_i, + cmd->ident); + + silc_client_command_reply_free(cmd); +} + +SILC_CLIENT_CMD_REPLY_FUNC(info_i) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcCommandStatus status; + unsigned char *tmp; + SilcIDCacheEntry id_cache; + SilcServerEntry server; + SilcServerID *server_id = NULL; + char *server_name, *server_info; + uint32 len; + + SILC_LOG_DEBUG(("Start")); + + tmp = silc_argument_get_arg_type(cmd->args, 1, NULL); + SILC_GET16_MSB(status, tmp); + if (status != SILC_STATUS_OK) + goto out; + + /* Get server ID */ + tmp = silc_argument_get_arg_type(cmd->args, 2, &len); + if (!tmp) + goto out; + + 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 */ + server_info = silc_argument_get_arg_type(cmd->args, 4, NULL); + if (!server_info) + goto out; + + /* 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")); + 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); + + /* Add it to the cache */ + silc_idcache_add(conn->server_cache, server->server_name, + server->server_id, (void *)server, 0, NULL); + } + + 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); +}