X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand_reply.c;h=a737af8d524f1bc1b498fac34504a7488cd421c4;hb=413da0f8686910f5e627393157566ae729ca99c4;hp=ddb4b0d34ff8a8928818719b8d0b7c52cb9b0523;hpb=2946cbec7d9cb8448ec01a270399960a1be195eb;p=silc.git diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c index ddb4b0d3..a737af8d 100644 --- a/lib/silcclient/command_reply.c +++ b/lib/silcclient/command_reply.c @@ -1,10 +1,10 @@ /* - command_reply.c + command_reply.c Author: Pekka Riikonen - Copyright (C) 1997 - 2002 Pekka Riikonen + Copyright (C) 1997 - 2003 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 @@ -25,7 +25,7 @@ * application through command_reply client operation. The arguments are * exactly same and in same order as the server sent it. However, ID's are * not sent to the application. Instead, corresponding ID entry is sent - * to the application. For example, instead of sending Client ID the + * to the application. For example, instead of sending Client ID the * corresponding SilcClientEntry is sent to the application. The case is * same with for example Channel ID's. This way application has all the * necessary data already in hand without redundant searching. If ID is @@ -38,15 +38,37 @@ #define SAY cmd->client->internal->ops->say -/* All functions that call the COMMAND_CHECK_STATUS macro must have - out: goto label. */ +/* All functions that call the COMMAND_CHECK_STATUS macro must have + out: and err: goto labels. out label should call the pending + command replies, and the err label just handle error condition. */ #define COMMAND_CHECK_STATUS \ do { \ SILC_LOG_DEBUG(("Start")); \ if (!silc_command_get_status(cmd->payload, NULL, NULL)) { \ - COMMAND_REPLY_ERROR; \ - goto out; \ + if (SILC_STATUS_IS_ERROR(cmd->status)) { \ + /* Single error */ \ + COMMAND_REPLY_ERROR(cmd->status); \ + goto out; \ + } \ + /* List of errors */ \ + COMMAND_REPLY_ERROR(cmd->error); \ + if (cmd->status == SILC_STATUS_LIST_END) \ + goto out; \ + goto err; \ + } \ +} while(0) + +/* Same as COMMAND_CHECK_STATUS but doesn't call client operation */ +#define COMMAND_CHECK_STATUS_I \ +do { \ + SILC_LOG_DEBUG(("Start")); \ + if (!silc_command_get_status(cmd->payload, NULL, NULL)) { \ + if (SILC_STATUS_IS_ERROR(cmd->status)) \ + goto out; \ + if (cmd->status == SILC_STATUS_LIST_END) \ + goto out; \ + goto err; \ } \ } while(0) @@ -62,7 +84,7 @@ void silc_client_command_reply_process(SilcClient client, SilcCommandPayload payload; SilcCommand command; SilcCommandCb reply = NULL; - + /* Get command reply payload from packet */ payload = silc_command_payload_parse(buffer->data, buffer->len); if (!payload) { @@ -70,10 +92,11 @@ void silc_client_command_reply_process(SilcClient client, SILC_LOG_DEBUG(("Bad command reply packet")); return; } - + /* Allocate command reply context. This must be free'd by the command reply routine receiving it. */ ctx = silc_calloc(1, sizeof(*ctx)); + ctx->users++; ctx->client = client; ctx->sock = sock; ctx->payload = payload; @@ -84,8 +107,8 @@ void silc_client_command_reply_process(SilcClient client, /* Check for pending commands and mark to be exeucted */ ctx->callbacks = - silc_client_command_pending_check(sock->user_data, ctx, - silc_command_get(ctx->payload), + silc_client_command_pending_check(sock->user_data, ctx, + silc_command_get(ctx->payload), ctx->ident, &ctx->callbacks_count); /* Execute command reply */ @@ -112,17 +135,32 @@ void silc_client_command_reply_process(SilcClient client, } } +/* Duplicate Command Reply Context by adding reference counter. The context + won't be free'd untill it hits zero. */ + +SilcClientCommandReplyContext +silc_client_command_reply_dup(SilcClientCommandReplyContext cmd) +{ + cmd->users++; + SILC_LOG_DEBUG(("Command reply context %p refcnt %d->%d", cmd, + cmd->users - 1, cmd->users)); + return cmd; +} + /* Free command reply context and its internals. */ void silc_client_command_reply_free(SilcClientCommandReplyContext cmd) { - if (cmd) { + cmd->users--; + SILC_LOG_DEBUG(("Command reply context %p refcnt %d->%d", cmd, + cmd->users + 1, cmd->users)); + if (cmd->users < 1) { silc_command_payload_free(cmd->payload); silc_free(cmd); } } -static void +static void silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, SilcStatus status, bool notify) @@ -139,27 +177,27 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, bool has_channels = FALSE, has_user_modes = FALSE; unsigned char *fingerprint; SilcUInt32 fingerprint_len; - + id_data = silc_argument_get_arg_type(cmd->args, 2, &len); if (!id_data) { if (notify) - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); return; } - + client_id = silc_id_payload_parse_id(id_data, len, NULL); if (!client_id) { if (notify) - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); return; } - + 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 || !realname) { if (notify) - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); return; } @@ -189,11 +227,11 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); if (!client_entry) { SILC_LOG_DEBUG(("Adding new client entry")); - client_entry = + client_entry = silc_client_add_client(cmd->client, conn, nickname, username, realname, client_id, mode); } else { - silc_client_update_client(cmd->client, conn, client_entry, + silc_client_update_client(cmd->client, conn, client_entry, nickname, username, realname, mode); silc_free(client_id); } @@ -203,14 +241,22 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, client_entry->fingerprint_len = fingerprint_len; } - if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) - client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; + /* Take Requested Attributes if set. */ + tmp = silc_argument_get_arg_type(cmd->args, 11, &len); + if (tmp) { + if (client_entry->attrs) + silc_attribute_payload_list_free(client_entry->attrs); + client_entry->attrs = silc_attribute_payload_parse(tmp, len); + } + + client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; /* Notify application */ if (!cmd->callbacks_count && notify) - COMMAND_REPLY((ARGS, client_entry, nickname, username, realname, - has_channels ? &channels : NULL, mode, idle, - fingerprint, has_user_modes ? &ch_user_modes : NULL)); + COMMAND_REPLY((SILC_ARGS, client_entry, nickname, username, realname, + has_channels ? &channels : NULL, mode, idle, + fingerprint, has_user_modes ? &ch_user_modes : NULL, + client_entry->attrs)); } /* Received reply for WHOIS command. This maybe called several times @@ -236,6 +282,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); + err: /* If we received notify for invalid ID we'll remove the ID if we have it cached. */ if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { @@ -276,13 +323,13 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) id_data = silc_argument_get_arg_type(cmd->args, 2, &len); if (!id_data) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - + client_id = silc_id_payload_parse_id(id_data, len, NULL); if (!client_id) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -294,14 +341,14 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) 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; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } /* Notify application. We don't save any history information to any - cache. Just pass the data to the application for displaying on + cache. Just pass the data to the application for displaying on the screen. */ - COMMAND_REPLY((ARGS, client_entry, nickname, username, realname)); + COMMAND_REPLY((SILC_ARGS, client_entry, nickname, username, realname)); /* Pending callbacks are not executed if this was an list entry */ if (cmd->status != SILC_STATUS_OK && @@ -312,10 +359,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOWAS); + err: silc_client_command_reply_free(cmd); } -static void +static void silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, SilcStatus status, bool notify) @@ -333,17 +381,17 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, char *name = NULL, *info = NULL; SilcIDPayload idp = NULL; SilcIdType id_type; - + id_data = silc_argument_get_arg_type(cmd->args, 2, &len); if (!id_data) { if (notify) - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); return; } idp = silc_id_payload_parse(id_data, len); if (!idp) { if (notify) - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); return; } @@ -362,20 +410,19 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); if (!client_entry) { SILC_LOG_DEBUG(("Adding new client entry")); - client_entry = + client_entry = silc_client_add_client(cmd->client, conn, name, info, NULL, silc_id_dup(client_id, id_type), 0); } else { - silc_client_update_client(cmd->client, conn, client_entry, + 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; + client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; /* Notify application */ if (notify) - COMMAND_REPLY((ARGS, client_entry, name, info)); + COMMAND_REPLY((SILC_ARGS, client_entry, name, info)); break; case SILC_ID_SERVER: @@ -391,14 +438,18 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, silc_id_dup(server_id, id_type)); if (!server_entry) { if (notify) - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); return; } + } else { + silc_client_update_server(client, conn, server_entry, name, info); } + server_entry->resolve_cmd_ident = 0; + /* Notify application */ if (notify) - COMMAND_REPLY((ARGS, server_entry, name, info)); + COMMAND_REPLY((SILC_ARGS, server_entry, name, info)); break; case SILC_ID_CHANNEL: @@ -420,7 +471,7 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, /* Notify application */ if (notify) - COMMAND_REPLY((ARGS, channel_entry, name, info)); + COMMAND_REPLY((SILC_ARGS, channel_entry, name, info)); break; } @@ -431,7 +482,7 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, } /* Received reply for IDENTIFY command. This maybe called several times - for one IDENTIFY command as server may reply with list of results. + 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) @@ -454,6 +505,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY); + err: /* If we received notify for invalid ID we'll remove the ID if we have it cached. */ if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { @@ -487,14 +539,15 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) SilcIDPayload idp; unsigned char *tmp; SilcUInt32 argc, len; + SilcClientID old_client_id; SILC_LOG_DEBUG(("Start")); if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "Cannot set nickname: %s", + "Cannot set nickname: %s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -502,15 +555,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) if (argc < 2 || argc > 3) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot set nickname: bad reply to command"); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } + /* Save old Client ID */ + old_client_id = *conn->local_id; + /* Take received Client ID */ tmp = silc_argument_get_arg_type(cmd->args, 2, &len); idp = silc_id_payload_parse(tmp, len); if (!idp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } silc_client_receive_new_id(cmd->client, cmd->sock, idp); @@ -518,18 +574,20 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) /* Take the new nickname too */ tmp = silc_argument_get_arg_type(cmd->args, 3, &len); if (tmp) { - silc_idcache_del_by_context(conn->client_cache, conn->local_entry); + silc_idcache_del_by_context(conn->internal->client_cache, + conn->local_entry); if (conn->nickname) silc_free(conn->nickname); conn->nickname = strdup(tmp); conn->local_entry->nickname = conn->nickname; silc_client_nickname_format(cmd->client, conn, conn->local_entry); - silc_idcache_add(conn->client_cache, strdup(tmp), + silc_idcache_add(conn->internal->client_cache, strdup(tmp), conn->local_entry->id, conn->local_entry, 0, NULL); } - + /* Notify application */ - COMMAND_REPLY((ARGS, conn->local_entry, conn->local_entry->nickname)); + COMMAND_REPLY((SILC_ARGS, conn->local_entry, conn->local_entry->nickname, + (const SilcClientID *)&old_client_id)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK); @@ -551,19 +609,19 @@ SILC_CLIENT_CMD_REPLY_FUNC(list) tmp = silc_argument_get_arg_type(cmd->args, 2, &len); if (!tmp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } channel_id = silc_id_payload_parse_id(tmp, len, NULL); if (!channel_id) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } name = silc_argument_get_arg_type(cmd->args, 3, NULL); if (!name) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -573,21 +631,21 @@ SILC_CLIENT_CMD_REPLY_FUNC(list) SILC_GET32_MSB(usercount, tmp); /* Check whether the channel exists, and add it to cache if it doesn't. */ - channel_entry = silc_client_get_channel_by_id(cmd->client, conn, + channel_entry = silc_client_get_channel_by_id(cmd->client, conn, channel_id); if (!channel_entry) { /* Add new channel entry */ channel_entry = silc_client_add_channel(cmd->client, conn, name, 0, channel_id); if (!channel_entry) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } channel_id = NULL; } /* Notify application */ - COMMAND_REPLY((ARGS, channel_entry, name, topic, usercount)); + COMMAND_REPLY((SILC_ARGS, channel_entry, name, topic, usercount)); /* Pending callbacks are not executed if this was an list entry */ if (cmd->status != SILC_STATUS_OK && @@ -599,6 +657,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(list) out: silc_free(channel_id); SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LIST); + err: silc_client_command_reply_free(cmd); } @@ -616,14 +675,14 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Cannot set topic: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } argc = silc_argument_get_arg_num(cmd->args); if (argc < 1 || argc > 3) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -645,12 +704,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); if (!channel) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - + /* Notify application */ - COMMAND_REPLY((ARGS, channel, topic)); + COMMAND_REPLY((SILC_ARGS, channel, topic)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC); @@ -667,11 +726,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) SilcChannelID *channel_id; unsigned char *tmp; SilcUInt32 len; + SilcBufferStruct buf; if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Cannot invite: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -688,15 +748,17 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); if (!channel) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } /* Get the invite list */ tmp = silc_argument_get_arg_type(cmd->args, 3, &len); + if (tmp) + silc_buffer_set(&buf, tmp, len); /* Notify application */ - COMMAND_REPLY((ARGS, channel, tmp)); + COMMAND_REPLY((SILC_ARGS, channel, tmp ? &buf : NULL)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INVITE); @@ -704,21 +766,38 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) } /* Received reply to the KILL command. */ - + SILC_CLIENT_CMD_REPLY_FUNC(kill) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcClientID *client_id; + SilcClientEntry client_entry = NULL; + SilcUInt32 len; + unsigned char *id_data; if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Cannot kill: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } + id_data = silc_argument_get_arg_type(cmd->args, 2, &len); + if (id_data) { + client_id = silc_id_payload_parse_id(id_data, len, NULL); + if (!client_id) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + + /* Get the client entry, if exists */ + client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); + silc_free(client_id); + } + /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS, client_entry)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL); @@ -741,9 +820,9 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) SILC_LOG_DEBUG(("Start")); if (cmd->error != SILC_STATUS_OK) { - SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -778,7 +857,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) } /* Notify application */ - COMMAND_REPLY((ARGS, server, server->server_name, server->server_info)); + COMMAND_REPLY((SILC_ARGS, server, server->server_name, server->server_info)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO); @@ -786,6 +865,38 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) silc_client_command_reply_free(cmd); } +/* Received reply to STATS command. */ + +SILC_CLIENT_CMD_REPLY_FUNC(stats) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + unsigned char *tmp, *buf = NULL; + SilcUInt32 len, buf_len = 0; + + if (cmd->error != SILC_STATUS_OK) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); + goto out; + } + + /* Get server ID */ + tmp = silc_argument_get_arg_type(cmd->args, 2, &len); + if (!tmp) + goto out; + + /* Get statistics structure */ + buf = silc_argument_get_arg_type(cmd->args, 3, &buf_len); + + /* Notify application */ + COMMAND_REPLY((SILC_ARGS, buf, buf_len)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_STATS); + silc_client_command_reply_free(cmd); +} + /* Received reply to PING command. The reply time is shown to user. */ SILC_CLIENT_CMD_REPLY_FUNC(ping) @@ -799,33 +910,33 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } curtime = time(NULL); id = silc_id_str2id(cmd->packet->src_id, cmd->packet->src_id_len, cmd->packet->src_id_type); - if (!id || !conn->ping) { - COMMAND_REPLY_ERROR; + if (!id || !conn->internal->ping) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - for (i = 0; i < conn->ping_count; i++) { - if (!conn->ping[i].dest_id) + for (i = 0; i < conn->internal->ping_count; i++) { + if (!conn->internal->ping[i].dest_id) continue; - if (SILC_ID_SERVER_COMPARE(conn->ping[i].dest_id, id)) { - diff = curtime - conn->ping[i].start_time; - SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, - "Ping reply from %s: %d second%s", - conn->ping[i].dest_name, diff, + if (SILC_ID_SERVER_COMPARE(conn->internal->ping[i].dest_id, id)) { + diff = curtime - conn->internal->ping[i].start_time; + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Ping reply from %s: %d second%s", + conn->internal->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; + + conn->internal->ping[i].start_time = 0; + silc_free(conn->internal->ping[i].dest_id); + conn->internal->ping[i].dest_id = NULL; + silc_free(conn->internal->ping[i].dest_name); + conn->internal->ping[i].dest_name = NULL; break; } } @@ -833,7 +944,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) silc_free(id); /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING); @@ -852,6 +963,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) SilcUInt32 argc, mode = 0, len, list_count; char *topic, *tmp, *channel_name = NULL, *hmac; SilcBuffer keyp = NULL, client_id_list = NULL, client_mode_list = NULL; + SilcPublicKey founder_key = NULL; + SilcBufferStruct chpklist; int i; SILC_LOG_DEBUG(("Start")); @@ -859,16 +972,16 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) if (cmd->error != SILC_STATUS_OK) { if (cmd->error != SILC_STATUS_ERR_USER_ON_CHANNEL) SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Cannot join channel: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } argc = silc_argument_get_arg_num(cmd->args); - if (argc < 7 || argc > 14) { + if (argc < 7) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -877,7 +990,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) if (!tmp) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } channel_name = tmp; @@ -887,12 +1000,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) if (!tmp) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } channel_id = silc_id_payload_parse_id(tmp, len, NULL); if (!channel_id) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -919,7 +1032,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) silc_client_replace_channel_id(cmd->client, conn, channel, channel_id); } else { /* Create new channel entry */ - channel = silc_client_add_channel(cmd->client, conn, channel_name, + channel = silc_client_add_channel(cmd->client, conn, channel_name, mode, channel_id); } @@ -929,9 +1042,9 @@ 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)) { - SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Unsupported HMAC `%s'", hmac); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } } @@ -981,7 +1094,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); if (!client_entry) { /* No, we don't have it, add entry for it. */ - client_entry = + client_entry = silc_client_add_client(cmd->client, conn, NULL, NULL, NULL, silc_id_dup(client_id, SILC_ID_CLIENT), 0); } @@ -1000,31 +1113,39 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) 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 - + silc_buffer_push(client_id_list, client_id_list->data - client_id_list->head); - silc_buffer_push(client_mode_list, client_mode_list->data - + silc_buffer_push(client_mode_list, client_mode_list->data - client_mode_list->head); /* Save channel key */ if (keyp && !(channel->mode & SILC_CHANNEL_MODE_PRIVKEY)) silc_client_save_channel_key(cmd->client, conn, keyp, channel); + /* Get founder key */ + tmp = silc_argument_get_arg_type(cmd->args, 15, &len); + if (tmp) + silc_pkcs_public_key_payload_decode(tmp, len, &founder_key); + + /* Get channel public key list */ + tmp = silc_argument_get_arg_type(cmd->args, 16, &len); + if (tmp) + silc_buffer_set(&chpklist, tmp, len); + /* Notify application */ - COMMAND_REPLY((ARGS, channel_name, channel, mode, 0, + COMMAND_REPLY((SILC_ARGS, channel_name, channel, mode, 0, keyp ? keyp->head : NULL, NULL, - NULL, topic, hmac, list_count, client_id_list, - client_mode_list)); + NULL, topic, hmac, list_count, client_id_list, + client_mode_list, founder_key, tmp ? &chpklist : NULL)); out: SILC_CLIENT_PENDING_EXEC(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); + if (founder_key) + silc_pkcs_public_key_free(founder_key); + silc_buffer_free(keyp); + silc_buffer_free(client_id_list); + silc_buffer_free(client_mode_list); } /* Received reply for MOTD command */ @@ -1039,20 +1160,20 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); return; } argc = silc_argument_get_arg_num(cmd->args); if (argc > 3) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } if (argc == 3) { motd = silc_argument_get_arg_type(cmd->args, 3, NULL); if (!motd) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -1061,14 +1182,14 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) while(cp[i] != 0) { if (cp[i++] == '\n') { memset(line, 0, sizeof(line)); - strncat(line, cp, i - 1); + silc_strncat(line, sizeof(line), cp, i - 1); cp += i; - + if (i == 2) line[0] = ' '; - + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", line); - + if (!strlen(cp)) break; i = 0; @@ -1077,7 +1198,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) } /* Notify application */ - COMMAND_REPLY((ARGS, motd)); + COMMAND_REPLY((SILC_ARGS, motd)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD); @@ -1095,14 +1216,14 @@ SILC_CLIENT_CMD_REPLY_FUNC(umode) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Cannot change mode: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } tmp = silc_argument_get_arg_type(cmd->args, 2, NULL); if (!tmp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -1110,7 +1231,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(umode) conn->local_entry->mode = mode; /* Notify application */ - COMMAND_REPLY((ARGS, mode)); + COMMAND_REPLY((SILC_ARGS, mode)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE); @@ -1128,11 +1249,13 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) SilcChannelID *channel_id; SilcChannelEntry channel; SilcUInt32 len; + SilcPublicKey public_key = NULL; + SilcBufferStruct channel_pubkeys; if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Cannot change mode: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -1148,15 +1271,15 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); if (!channel) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - + /* Get channel mode */ tmp = silc_argument_get_arg_type(cmd->args, 3, NULL); if (!tmp) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -1164,12 +1287,27 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) SILC_GET32_MSB(mode, tmp); channel->mode = mode; + /* Get founder public key */ + tmp = silc_argument_get_arg_type(cmd->args, 4, &len); + if (tmp) { + if (!silc_pkcs_public_key_payload_decode(tmp, len, &public_key)) + public_key = NULL; + } + + /* Get channel public key(s) */ + tmp = silc_argument_get_arg_type(cmd->args, 5, &len); + if (tmp) + silc_buffer_set(&channel_pubkeys, tmp, len); + /* Notify application */ - COMMAND_REPLY((ARGS, channel, mode)); + COMMAND_REPLY((SILC_ARGS, channel, mode, public_key, + tmp ? &channel_pubkeys : NULL)); silc_free(channel_id); out: + if (public_key) + silc_pkcs_public_key_free(public_key); SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CMODE); silc_client_command_reply_free(cmd); } @@ -1187,18 +1325,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) SilcChannelUser chu; unsigned char *modev, *tmp, *id; SilcUInt32 len, mode; - + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Cannot change mode: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } - + /* Get channel mode */ modev = silc_argument_get_arg_type(cmd->args, 2, NULL); if (!modev) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -1214,30 +1352,30 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); if (!channel) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - + /* Get Client ID */ id = silc_argument_get_arg_type(cmd->args, 4, &len); if (!id) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } client_id = silc_id_payload_parse_id(id, len, NULL); if (!client_id) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - + /* Get client entry */ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); if (!client_entry) { silc_free(channel_id); silc_free(client_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } @@ -1248,10 +1386,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) chu->mode = mode; /* Notify application */ - COMMAND_REPLY((ARGS, mode, channel, client_entry)); + COMMAND_REPLY((SILC_ARGS, mode, channel, client_entry)); silc_free(client_id); silc_free(channel_id); - + out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CUMODE); silc_client_command_reply_free(cmd); @@ -1261,18 +1399,60 @@ SILC_CLIENT_CMD_REPLY_FUNC(kick) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcClientID *client_id = NULL; + SilcChannelID *channel_id = NULL; + SilcClientEntry client_entry = NULL; + SilcChannelEntry channel = NULL; + unsigned char *tmp; + SilcUInt32 len; if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Cannot kick: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } + /* Take Channel ID */ + tmp = silc_argument_get_arg_type(cmd->args, 2, &len); + if (tmp) { + channel_id = silc_id_payload_parse_id(tmp, len, NULL); + if (!channel_id) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + + /* Get the channel entry */ + channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); + if (!channel) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + } + + /* Get Client ID */ + tmp = silc_argument_get_arg_type(cmd->args, 3, &len); + if (tmp) { + client_id = silc_id_payload_parse_id(tmp, len, NULL); + if (!client_id) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + + /* Get client entry */ + client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); + if (!client_entry) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + } + /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS, channel, client_entry)); out: + silc_free(channel_id); + silc_free(client_id); SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK); silc_client_command_reply_free(cmd); } @@ -1285,12 +1465,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(silcoper) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER); @@ -1305,12 +1485,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(oper) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER); @@ -1326,18 +1506,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(detach) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); /* Generate the detachment data and deliver it to the client in the detach client operation */ detach = silc_client_get_detach_data(cmd->client, conn); if (detach) { - cmd->client->internal->ops->detach(cmd->client, conn, + cmd->client->internal->ops->detach(cmd->client, conn, detach->data, detach->len); silc_buffer_free(detach); } @@ -1355,12 +1535,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(watch) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WATCH); @@ -1375,11 +1555,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(ban) SilcChannelID *channel_id; unsigned char *tmp; SilcUInt32 len; + SilcBufferStruct buf; if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -1396,15 +1577,17 @@ SILC_CLIENT_CMD_REPLY_FUNC(ban) channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); if (!channel) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - + /* Get the ban list */ tmp = silc_argument_get_arg_type(cmd->args, 3, &len); + if (tmp) + silc_buffer_set(&buf, tmp, len); /* Notify application */ - COMMAND_REPLY((ARGS, channel, tmp)); + COMMAND_REPLY((SILC_ARGS, channel, tmp ? &buf : NULL)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_BAN); @@ -1419,13 +1602,14 @@ SILC_CLIENT_CMD_REPLY_FUNC(leave) SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcChannelID *channel_id; SilcChannelEntry channel = NULL; + SilcChannelUser chu; unsigned char *tmp; SilcUInt32 len; if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -1440,15 +1624,27 @@ SILC_CLIENT_CMD_REPLY_FUNC(leave) channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); if (!channel) { silc_free(channel_id); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } + /* Remove us from this channel. */ + chu = silc_client_on_channel(channel, conn->local_entry); + if (chu) { + silc_hash_table_del(chu->client->channels, chu->channel); + silc_hash_table_del(chu->channel->user_list, chu->client); + silc_free(chu); + } + silc_free(channel_id); } /* Notify application */ - COMMAND_REPLY((ARGS, channel)); + COMMAND_REPLY((SILC_ARGS, channel)); + + /* Now delete the channel. */ + if (channel) + silc_client_del_channel(cmd->client, conn, channel); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE); @@ -1470,7 +1666,7 @@ static void silc_client_command_reply_users_cb(SilcClient client, cmd->status = cmd->error = SILC_STATUS_ERR_NO_SUCH_CHANNEL; SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS); silc_client_command_reply_free(cmd); return; @@ -1483,6 +1679,7 @@ static int silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, SilcStatus status, bool notify, + bool resolve, SilcGetChannelCallback get_channel, SilcCommandCb get_clients) { @@ -1504,19 +1701,19 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, /* Get channel ID */ tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len); if (!tmp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } channel_id = silc_id_payload_parse_id(tmp, tmp_len, NULL); if (!channel_id) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - + /* Get the list count */ tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len); if (!tmp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } SILC_GET32_MSB(list_count, tmp); @@ -1524,7 +1721,7 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, /* Get Client ID list */ tmp = silc_argument_get_arg_type(cmd->args, 4, &tmp_len); if (!tmp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } silc_buffer_set(&client_id_list, tmp, tmp_len); @@ -1532,7 +1729,7 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, /* Get client mode list */ tmp = silc_argument_get_arg_type(cmd->args, 5, &tmp_len); if (!tmp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } silc_buffer_set(&client_mode_list, tmp, tmp_len); @@ -1568,35 +1765,21 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, /* Check if we have this client cached already. */ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); if (!client_entry || !client_entry->username || !client_entry->realname) { - if (client_entry) { - if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) { - /* Attach to this resolving and wait until it finishes */ - silc_client_command_pending(conn, SILC_COMMAND_NONE, - client_entry->resolve_cmd_ident, - get_clients, cmd); - wait_res = TRUE; - - silc_buffer_pull(&client_id_list, idp_len); - silc_buffer_pull(&client_mode_list, 4); - continue; - } - client_entry->status |= SILC_CLIENT_STATUS_RESOLVING; - client_entry->resolve_cmd_ident = conn->cmd_ident + 1; + if (resolve) { + /* 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 + 4; + res_argc++; } - - /* 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 { if (!silc_client_on_channel(channel, client_entry)) { chu = silc_calloc(1, sizeof(*chu)); @@ -1625,7 +1808,7 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, 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, + silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, res_cmd->data, res_cmd->len, TRUE); @@ -1646,14 +1829,14 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, if (wait_res) return 1; - silc_buffer_push(&client_id_list, (client_id_list.data - + silc_buffer_push(&client_id_list, (client_id_list.data - client_id_list.head)); - silc_buffer_push(&client_mode_list, (client_mode_list.data - + silc_buffer_push(&client_mode_list, (client_mode_list.data - client_mode_list.head)); /* Notify application */ if (notify) - COMMAND_REPLY((ARGS, channel, list_count, &client_id_list, + COMMAND_REPLY((SILC_ARGS, channel, list_count, &client_id_list, &client_mode_list)); out: @@ -1668,17 +1851,35 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcClientCommandReplyContext r = (SilcClientCommandReplyContext)context2; SILC_LOG_DEBUG(("Start")); if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + "Query failed: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } - if (silc_client_command_reply_users_save(cmd, cmd->status, TRUE, + if (r && !silc_command_get_status(r->payload, NULL, &cmd->error)) { + if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + /* Do not resolve anymore. Server may be sending us some non-existent + Client ID (a bug in server), and we want to show the users list + anyway. */ + silc_client_command_reply_users_save(cmd, cmd->status, TRUE, FALSE, + silc_client_command_reply_users_cb, + silc_client_command_reply_users); + goto out; + } else { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "Query failed: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + } + + if (silc_client_command_reply_users_save(cmd, cmd->status, TRUE, TRUE, silc_client_command_reply_users_cb, silc_client_command_reply_users)) return; @@ -1700,10 +1901,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) SilcClientEntry client_entry; SilcServerID *server_id = NULL; SilcServerEntry server_entry; - SilcSKEPKType type; - unsigned char *tmp, *pk; + unsigned char *tmp; SilcUInt32 len; - SilcUInt16 pk_len; SilcIdType id_type; SilcPublicKey public_key = NULL; @@ -1712,57 +1911,59 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } tmp = silc_argument_get_arg_type(cmd->args, 2, &len); if (!tmp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } idp = silc_id_payload_parse(tmp, len); if (!idp) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } /* 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) - if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key)) - public_key = NULL; - } - + if (!silc_pkcs_public_key_payload_decode(tmp, len, &public_key)) + public_key = NULL; + } + 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); client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); if (!client_entry) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } + /* Save fingerprint */ + if (!client_entry->fingerprint) { + client_entry->fingerprint = silc_calloc(20, sizeof(unsigned char)); + client_entry->fingerprint_len = 20; + silc_hash_make(cmd->client->sha1hash, tmp + 4, len - 4, + client_entry->fingerprint); + } + /* Notify application */ - COMMAND_REPLY((ARGS, id_type, client_entry, public_key)); + COMMAND_REPLY((SILC_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); server_entry = silc_client_get_server_by_id(cmd->client, conn, server_id); if (!server_entry) { - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } /* Notify application */ - COMMAND_REPLY((ARGS, id_type, server_entry, public_key)); + COMMAND_REPLY((SILC_ARGS, id_type, server_entry, public_key)); } out: @@ -1793,10 +1994,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois_i) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SILC_LOG_DEBUG(("Start")); - - if (cmd->error != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Save WHOIS info */ silc_client_command_reply_whois_save(cmd, cmd->status, FALSE); @@ -1811,6 +2009,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois_i) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); + err: /* If we received notify for invalid ID we'll remove the ID if we have it cached. */ if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { @@ -1844,10 +2043,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify_i) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SILC_LOG_DEBUG(("Start")); - - if (cmd->error != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Save IDENTIFY info */ silc_client_command_reply_identify_save(cmd, cmd->status, FALSE); @@ -1862,6 +2058,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify_i) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY); + err: /* If we received notify for invalid ID we'll remove the ID if we have it cached. */ if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { @@ -1900,10 +2097,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(info_i) char *server_name, *server_info; SilcUInt32 len; - SILC_LOG_DEBUG(("Start")); - - if (cmd->error != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Get server ID */ tmp = silc_argument_get_arg_type(cmd->args, 2, &len); @@ -1931,10 +2125,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(info_i) silc_client_add_server(cmd->client, conn, server_name, server_info, silc_id_dup(server_id, SILC_ID_SERVER)); } - + out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO); silc_free(server_id); + err: silc_client_command_reply_free(cmd); } @@ -1951,7 +2146,7 @@ static void silc_client_command_reply_users_i_cb(SilcClient client, cmd->status = cmd->error = SILC_STATUS_ERR_NO_SUCH_CHANNEL; SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS); silc_client_command_reply_free(cmd); return; @@ -1964,14 +2159,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(users_i) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; - SILC_LOG_DEBUG(("Start")); - - if (cmd->error != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Save USERS info */ if (silc_client_command_reply_users_save( - cmd, cmd->status, FALSE, + cmd, cmd->status, FALSE, TRUE, silc_client_command_reply_users_i_cb, silc_client_command_reply_users_i)) return; @@ -1979,6 +2171,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users_i) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS); + err: /* Unregister this command reply */ silc_client_command_unregister(cmd->client, SILC_COMMAND_USERS, NULL, silc_client_command_reply_users_i, @@ -1998,12 +2191,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(connect) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CONNECT); @@ -2018,18 +2211,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(close) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CLOSE); silc_client_command_reply_free(cmd); } - + SILC_CLIENT_CMD_REPLY_FUNC(shutdown) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; @@ -2038,12 +2231,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(shutdown) if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", silc_get_status_message(cmd->error)); - COMMAND_REPLY_ERROR; + COMMAND_REPLY_ERROR(cmd->error); goto out; } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_SHUTDOWN);