X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand_reply.c;h=37384977c1e04cf8245669a25f5630a38baff8ba;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=9246831c0788ec5c9665738c01a172e72076f73b;hpb=33fde1853daddd7f34565507cb96652f0cec4ee2;p=silc.git diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c index 9246831c..37384977 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 - 2005 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,95 +25,51 @@ * 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 * received but ID entry does not exist, NULL is sent. */ -#include "silcincludes.h" +#include "silc.h" #include "silcclient.h" #include "client_internal.h" -const SilcCommandStatusMessage silc_command_status_messages[] = { - - { STAT(NO_SUCH_NICK), "There was no such nickname" }, - { STAT(NO_SUCH_CHANNEL), "There was no such channel" }, - { STAT(NO_SUCH_SERVER), "There was no such server" }, - { STAT(TOO_MANY_TARGETS), "Duplicate recipients. No message delivered" }, - { STAT(NO_RECIPIENT), "No recipient given" }, - { STAT(UNKNOWN_COMMAND), "Unknown command" }, - { STAT(WILDCARDS), "Unknown command" }, - { STAT(NO_CLIENT_ID), "No Client ID given" }, - { STAT(NO_CHANNEL_ID), "No Channel ID given" }, - { STAT(NO_SERVER_ID), "No Server ID given" }, - { STAT(BAD_CLIENT_ID), "Bad Client ID" }, - { STAT(BAD_CHANNEL_ID), "Bad Channel ID" }, - { STAT(NO_SUCH_CLIENT_ID), "There is no such client" }, - { STAT(NO_SUCH_CHANNEL_ID),"There is no such channel" }, - { STAT(NICKNAME_IN_USE), "Nickname already exists" }, - { STAT(NOT_ON_CHANNEL), "You are not on that channel" }, - { STAT(USER_NOT_ON_CHANNEL),"They are not on the channel" }, - { STAT(USER_ON_CHANNEL), "User already on the channel" }, - { STAT(NOT_REGISTERED), "You have not registered" }, - { STAT(NOT_ENOUGH_PARAMS), "Not enough parameters" }, - { STAT(TOO_MANY_PARAMS), "Too many parameters" }, - { STAT(PERM_DENIED), "Permission denied" }, - { STAT(BANNED_FROM_SERVER),"You are banned from this server" }, - { STAT(BAD_PASSWORD), "Cannot join channel. Incorrect password" }, - { STAT(CHANNEL_IS_FULL), "Cannot join channel. Channel is full" }, - { STAT(NOT_INVITED), "Cannot join channel. You have not been invited" }, - { STAT(BANNED_FROM_CHANNEL), "Cannot join channel. You have been banned" }, - { STAT(UNKNOWN_MODE), "Unknown mode" }, - { STAT(NOT_YOU), "Cannot change mode for other users" }, - { STAT(NO_CHANNEL_PRIV), "Permission denied. You are not channel operator" }, - { STAT(NO_CHANNEL_FOPRIV),"Permission denied. You are not channel founder" }, - { STAT(NO_SERVER_PRIV), "Permission denied. You are not server operator" }, - { STAT(NO_ROUTER_PRIV), "Permission denied. You are not SILC operator" }, - { STAT(BAD_NICKNAME), "Bad nickname" }, - { STAT(BAD_CHANNEL), "Bad channel name" }, - { STAT(AUTH_FAILED), "Authentication failed" }, - { STAT(UNKNOWN_ALGORITHM), "Unsupported algorithm" }, - { STAT(NO_SUCH_SERVER_ID), "No such Server ID" }, - - { 0, NULL } -}; -/* Command reply operation that is called at the end of all command replys. - Usage: COMMAND_REPLY((ARGS, argument1, argument2, etc...)), */ -#define COMMAND_REPLY(args) cmd->client->internal->ops->command_reply args -#define ARGS cmd->client, cmd->sock->user_data, \ - cmd->payload, TRUE, silc_command_get(cmd->payload), cmd->status - -/* Error reply to application. Usage: COMMAND_REPLY_ERROR; */ -#define COMMAND_REPLY_ERROR cmd->client->internal->ops-> \ - command_reply(cmd->client, cmd->sock->user_data, cmd->payload, \ - FALSE, silc_command_get(cmd->payload), cmd->status) - #define SAY cmd->client->internal->ops->say -/* 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")); \ - if (cmd->status != SILC_STATUS_OK) { \ - COMMAND_REPLY_ERROR; \ - goto out; \ - } \ +/* 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)) { \ + 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) -#define COMMAND_CHECK_STATUS_LIST \ -do { \ - SILC_LOG_DEBUG(("Start")); \ - if (cmd->status != SILC_STATUS_OK && \ - cmd->status != SILC_STATUS_LIST_START && \ - cmd->status != SILC_STATUS_LIST_ITEM && \ - cmd->status != SILC_STATUS_LIST_END) { \ - COMMAND_REPLY_ERROR; \ - goto out; \ - } \ +/* 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) /* Process received command reply. */ @@ -128,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) { @@ -136,22 +92,24 @@ 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; - ctx->status = silc_command_get_status(ctx->payload); ctx->args = silc_command_get_args(ctx->payload); ctx->packet = packet; ctx->ident = silc_command_get_ident(ctx->payload); + silc_command_get_status(ctx->payload, &ctx->status, &ctx->error); /* Check for pending commands and mark to be exeucted */ - silc_client_command_pending_check(sock->user_data, ctx, - silc_command_get(ctx->payload), - ctx->ident); + ctx->callbacks = + silc_client_command_pending_check(sock->user_data, ctx, + silc_command_get(ctx->payload), + ctx->ident, &ctx->callbacks_count); /* Execute command reply */ @@ -177,81 +135,76 @@ void silc_client_command_reply_process(SilcClient client, } } -/* Returns status message string */ +/* Duplicate Command Reply Context by adding reference counter. The context + won't be free'd untill it hits zero. */ -char *silc_client_command_status_message(SilcCommandStatus status) +SilcClientCommandReplyContext +silc_client_command_reply_dup(SilcClientCommandReplyContext cmd) { - int i; - - for (i = 0; silc_command_status_messages[i].message; i++) { - if (silc_command_status_messages[i].status == status) - break; - } - - if (silc_command_status_messages[i].message == NULL) - return NULL; - - return silc_command_status_messages[i].message; + 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 +void silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, - SilcCommandStatus status, - bool notify) + SilcStatus status, + SilcBool notify) { SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcClientID *client_id; SilcClientEntry client_entry = NULL; - int argc; SilcUInt32 len; unsigned char *id_data, *tmp; char *nickname = NULL, *username = NULL; char *realname = NULL; SilcUInt32 idle = 0, mode = 0; - SilcBuffer channels = NULL; + SilcBufferStruct channels, ch_user_modes; + SilcBool has_channels = FALSE, has_user_modes = FALSE; unsigned char *fingerprint; SilcUInt32 fingerprint_len; - - argc = silc_argument_get_arg_num(cmd->args); 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; } tmp = silc_argument_get_arg_type(cmd->args, 6, &len); if (tmp) { - channels = silc_buffer_alloc(len); - silc_buffer_pull_tail(channels, SILC_BUFFER_END(channels)); - silc_buffer_put(channels, tmp, len); + silc_buffer_set(&channels, tmp, len); + has_channels = TRUE; } tmp = silc_argument_get_arg_type(cmd->args, 7, &len); @@ -264,15 +217,26 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, fingerprint = silc_argument_get_arg_type(cmd->args, 9, &fingerprint_len); + tmp = silc_argument_get_arg_type(cmd->args, 10, &len); + if (tmp) { + silc_buffer_set(&ch_user_modes, tmp, len); + has_user_modes = TRUE; + } + /* Check if we have this client cached already. */ 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); + if (!client_entry) { + if (notify) + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + return; + } } 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); } @@ -282,16 +246,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); + } - /* Notify application */ - if (!cmd->callback && notify) - COMMAND_REPLY((ARGS, client_entry, nickname, username, realname, - channels, mode, idle, fingerprint)); + client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; - if (channels) - silc_buffer_free(channels); + /* Notify application */ + if (!cmd->callbacks_count && notify) + 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 @@ -302,7 +272,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - COMMAND_CHECK_STATUS_LIST; + COMMAND_CHECK_STATUS; /* Save WHOIS info */ silc_client_command_reply_whois_save(cmd, cmd->status, TRUE); @@ -317,9 +287,10 @@ 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->status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { SilcClientEntry client_entry; SilcUInt32 tmp_len; unsigned char *tmp = @@ -353,17 +324,17 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) char *nickname, *username; char *realname = NULL; - COMMAND_CHECK_STATUS_LIST; + COMMAND_CHECK_STATUS; 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; } @@ -375,14 +346,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 && @@ -393,13 +364,14 @@ 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, - SilcCommandStatus status, - bool notify) + SilcStatus status, + SilcBool notify) { SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcClient client = cmd->client; @@ -409,25 +381,22 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, SilcClientEntry client_entry; SilcServerEntry server_entry; SilcChannelEntry channel_entry; - int argc; SilcUInt32 len; unsigned char *id_data; char *name = NULL, *info = NULL; SilcIDPayload idp = NULL; SilcIdType id_type; - - argc = silc_argument_get_arg_num(cmd->args); id_data = silc_argument_get_arg_type(cmd->args, 2, &len); if (!id_data) { 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; } @@ -446,20 +415,24 @@ 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); + if (!client_entry) { + if (notify) + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + return; + } } 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: @@ -475,14 +448,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: @@ -499,12 +476,17 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, /* Add new channel entry */ channel_entry = silc_client_add_channel(client, conn, name, 0, channel_id); + if (!channel_entry) { + if (notify) + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + return; + } channel_id = NULL; } /* Notify application */ if (notify) - COMMAND_REPLY((ARGS, channel_entry, name, info)); + COMMAND_REPLY((SILC_ARGS, channel_entry, name, info)); break; } @@ -515,7 +497,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) @@ -523,7 +505,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - COMMAND_CHECK_STATUS_LIST; + COMMAND_CHECK_STATUS; /* Save IDENTIFY info */ silc_client_command_reply_identify_save(cmd, cmd->status, TRUE); @@ -538,9 +520,10 @@ 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->status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { SilcClientEntry client_entry; SilcUInt32 tmp_len; unsigned char *tmp = @@ -571,39 +554,65 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) SilcIDPayload idp; unsigned char *tmp; SilcUInt32 argc, len; + SilcClientID old_client_id; SILC_LOG_DEBUG(("Start")); - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "Cannot set nickname: %s", - silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "Cannot set nickname: %s", + silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } argc = silc_argument_get_arg_num(cmd->args); - if (argc < 2 || argc > 2) { + 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); - + + /* Take the new nickname too */ + tmp = silc_argument_get_arg_type(cmd->args, 3, &len); + if (tmp) { + 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; + + /* Normalize nickname */ + tmp = silc_identifier_check(conn->nickname, strlen(conn->nickname), + SILC_STRING_UTF8, 128, NULL); + if (!tmp) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_BAD_NICKNAME); + goto out; + } + + silc_client_nickname_format(cmd->client, conn, conn->local_entry); + + silc_idcache_add(conn->internal->client_cache, tmp, + conn->local_entry->id, conn->local_entry, 0, NULL); + } + /* Notify application */ - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK); - COMMAND_REPLY((ARGS, conn->local_entry)); - silc_client_command_reply_free(cmd); - return; + 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); @@ -615,19 +624,54 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) SILC_CLIENT_CMD_REPLY_FUNC(list) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; unsigned char *tmp, *name, *topic; - SilcUInt32 usercount = 0; + SilcUInt32 usercount = 0, len; + SilcChannelID *channel_id = NULL; + SilcChannelEntry channel_entry; - COMMAND_CHECK_STATUS_LIST; + COMMAND_CHECK_STATUS; + + tmp = silc_argument_get_arg_type(cmd->args, 2, &len); + if (!tmp) { + /* There were no channels in the network. */ + COMMAND_REPLY((SILC_ARGS, NULL, NULL, 0)); + goto out; + } + + channel_id = silc_id_payload_parse_id(tmp, len, NULL); + if (!channel_id) { + 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(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + topic = silc_argument_get_arg_type(cmd->args, 4, NULL); tmp = silc_argument_get_arg_type(cmd->args, 5, NULL); if (tmp) SILC_GET32_MSB(usercount, tmp); + /* 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_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(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + channel_id = NULL; + } + /* Notify application */ - COMMAND_REPLY((ARGS, NULL, 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 && @@ -637,7 +681,9 @@ 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); } @@ -653,16 +699,16 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) char *topic; SilcUInt32 argc, len; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - 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; } @@ -684,12 +730,17 @@ 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; } - + + if (topic) { + silc_free(channel->topic); + channel->topic = silc_memdup(topic, strlen(topic)); + } + /* Notify application */ - COMMAND_REPLY((ARGS, channel, topic)); + COMMAND_REPLY((SILC_ARGS, channel, topic)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC); @@ -706,11 +757,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) SilcChannelID *channel_id; unsigned char *tmp; SilcUInt32 len; + SilcBufferStruct buf; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "Cannot invite: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -727,15 +779,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); @@ -743,21 +797,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->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - 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); @@ -779,10 +850,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) SILC_LOG_DEBUG(("Start")); - if (cmd->status != SILC_STATUS_OK) { - SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", - silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + 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; } @@ -817,7 +888,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); @@ -825,6 +896,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) @@ -835,36 +938,36 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) int i; time_t diff, curtime; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->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; } } @@ -872,7 +975,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); @@ -891,23 +994,24 @@ 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; + SilcBufferStruct chpklist; int i; SILC_LOG_DEBUG(("Start")); - if (cmd->status != SILC_STATUS_OK) { - if (cmd->status != SILC_STATUS_ERR_USER_ON_CHANNEL) + 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_client_command_status_message(cmd->status)); - 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; } @@ -916,7 +1020,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; @@ -926,12 +1030,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; } @@ -958,19 +1062,24 @@ 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); } + if (!channel) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_BAD_CHANNEL); + goto out; + } conn->current_channel = channel; + channel->mode = mode; /* Get hmac */ 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; } } @@ -1020,9 +1129,11 @@ 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); + if (!client_entry) + goto out; } /* Join client to the channel */ @@ -1039,31 +1150,54 @@ 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)) + if (keyp) 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) { + if (channel->founder_key) + silc_pkcs_public_key_free(channel->founder_key); + channel->founder_key = NULL; + silc_pkcs_public_key_payload_decode(tmp, len, &channel->founder_key); + } + + /* Get user limit */ + tmp = silc_argument_get_arg_type(cmd->args, 17, &len); + if (tmp && len == 4) + SILC_GET32_MSB(channel->user_limit, tmp); + if (!(channel->mode & SILC_CHANNEL_MODE_ULIMIT)) + channel->user_limit = 0; + + /* Get channel public key list */ + tmp = silc_argument_get_arg_type(cmd->args, 16, &len); + if (tmp) + silc_buffer_set(&chpklist, tmp, len); + + if (topic) { + silc_free(channel->topic); + channel->topic = silc_memdup(topic, strlen(topic)); + } + /* 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, channel->founder_key, + tmp ? &chpklist : NULL, channel->user_limit)); 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); + silc_buffer_free(keyp); + silc_buffer_free(client_id_list); + silc_buffer_free(client_mode_list); } /* Received reply for MOTD command */ @@ -1075,23 +1209,23 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) SilcUInt32 argc, i; char *motd = NULL, *cp, line[256]; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->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; } @@ -1100,14 +1234,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; @@ -1116,7 +1250,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); @@ -1132,16 +1266,16 @@ SILC_CLIENT_CMD_REPLY_FUNC(umode) unsigned char *tmp; SilcUInt32 mode; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - 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; } @@ -1149,7 +1283,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); @@ -1167,11 +1301,13 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) SilcChannelID *channel_id; SilcChannelEntry channel; SilcUInt32 len; + SilcPublicKey public_key = NULL; + SilcBufferStruct channel_pubkeys; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "Cannot change mode: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -1187,15 +1323,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; } @@ -1203,12 +1339,34 @@ 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 user limit */ + tmp = silc_argument_get_arg_type(cmd->args, 6, &len); + if (tmp && len == 4) + SILC_GET32_MSB(channel->user_limit, tmp); + if (!(channel->mode & SILC_CHANNEL_MODE_ULIMIT)) + channel->user_limit = 0; + + /* 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, channel->user_limit)); 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); } @@ -1226,18 +1384,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) SilcChannelUser chu; unsigned char *modev, *tmp, *id; SilcUInt32 len, mode; - - if (cmd->status != SILC_STATUS_OK) { + + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - 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; } @@ -1253,30 +1411,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; } @@ -1287,10 +1445,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); @@ -1300,18 +1458,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->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - 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); } @@ -1321,15 +1521,15 @@ SILC_CLIENT_CMD_REPLY_FUNC(silcoper) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->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); @@ -1341,38 +1541,68 @@ SILC_CLIENT_CMD_REPLY_FUNC(oper) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->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); silc_client_command_reply_free(cmd); } -SILC_CLIENT_CMD_REPLY_FUNC(connect) +SILC_CLIENT_CMD_REPLY_FUNC(detach) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcBuffer 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(cmd->error); + goto out; + } + + /* Notify application */ + 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, + detach->data, detach->len); + silc_buffer_free(detach); + } + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_DETACH); + silc_client_command_reply_free(cmd); +} + +SILC_CLIENT_CMD_REPLY_FUNC(watch) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->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_CONNECT); + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WATCH); silc_client_command_reply_free(cmd); } @@ -1384,11 +1614,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(ban) SilcChannelID *channel_id; unsigned char *tmp; SilcUInt32 len; + SilcBufferStruct buf; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } @@ -1405,77 +1636,74 @@ 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); silc_client_command_reply_free(cmd); } -SILC_CLIENT_CMD_REPLY_FUNC(close) -{ - SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; - SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - - if (cmd->status != SILC_STATUS_OK) { - SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; - goto out; - } - - /* Notify application */ - COMMAND_REPLY((ARGS)); +/* Reply to LEAVE command. */ - out: - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CLOSE); - silc_client_command_reply_free(cmd); -} - -SILC_CLIENT_CMD_REPLY_FUNC(shutdown) +SILC_CLIENT_CMD_REPLY_FUNC(leave) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcChannelID *channel_id; + SilcChannelEntry channel = NULL; + SilcChannelUser chu; + unsigned char *tmp; + SilcUInt32 len; - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); goto out; } - /* Notify application */ - COMMAND_REPLY((ARGS)); + /* From protocol version 1.1 we get the channel ID of the left channel */ + 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) + goto out; - out: - SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SHUTDOWN); - silc_client_command_reply_free(cmd); -} - -/* Reply to LEAVE command. */ + /* Get the channel entry */ + channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); + if (!channel) { + silc_free(channel_id); + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } -SILC_CLIENT_CMD_REPLY_FUNC(leave) -{ - SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; - SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + /* 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); + } - if (cmd->status != SILC_STATUS_OK) { - SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; - goto out; + silc_free(channel_id); } /* Notify application */ - COMMAND_REPLY((ARGS)); + 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); @@ -1493,11 +1721,11 @@ static void silc_client_command_reply_users_cb(SilcClient client, if (!channels_count) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SilcCommandStatus status = SILC_STATUS_ERR_NO_SUCH_CHANNEL; + cmd->status = cmd->error = SILC_STATUS_ERR_NO_SUCH_CHANNEL; SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS); silc_client_command_reply_free(cmd); return; @@ -1506,50 +1734,45 @@ static void silc_client_command_reply_users_cb(SilcClient client, silc_client_command_reply_users(context, NULL); } -/* Reply to USERS command. Received list of client ID's and theirs modes - on the channel we requested. */ - -SILC_CLIENT_CMD_REPLY_FUNC(users) +static int +silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, + SilcStatus status, + SilcBool notify, + SilcBool resolve, + SilcGetChannelCallback get_channel, + SilcCommandCb get_clients) { - SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; SilcChannelEntry channel; SilcClientEntry client_entry; SilcChannelUser chu; SilcChannelID *channel_id = NULL; - SilcBuffer client_id_list = NULL; - SilcBuffer client_mode_list = NULL; + SilcBufferStruct client_id_list, client_mode_list; unsigned char *tmp; SilcUInt32 tmp_len, list_count; int i; unsigned char **res_argv = NULL; SilcUInt32 *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0; + SilcBool wait_res = FALSE; SILC_LOG_DEBUG(("Start")); - if (cmd->status != SILC_STATUS_OK) { - SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; - goto out; - } - /* 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); @@ -1557,40 +1780,31 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) /* 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; } - - client_id_list = silc_buffer_alloc(tmp_len); - silc_buffer_pull_tail(client_id_list, tmp_len); - silc_buffer_put(client_id_list, tmp, tmp_len); + silc_buffer_set(&client_id_list, tmp, tmp_len); /* 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; } - - client_mode_list = silc_buffer_alloc(tmp_len); - silc_buffer_pull_tail(client_mode_list, tmp_len); - silc_buffer_put(client_mode_list, tmp, tmp_len); + silc_buffer_set(&client_mode_list, tmp, tmp_len); /* Get channel entry */ channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id); if (!channel) { /* Resolve the channel from server */ silc_client_get_channel_by_id_resolve(cmd->client, conn, channel_id, - silc_client_command_reply_users_cb, - cmd); + get_channel, 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); - return; + return 1; } + SILC_LOG_DEBUG(("channel %s, %d users", channel->channel_name, list_count)); + /* Cache the received Client ID's and modes. */ for (i = 0; i < list_count; i++) { SilcUInt16 idp_len; @@ -1598,40 +1812,33 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) SilcClientID *client_id; /* Client ID */ - SILC_GET16_MSB(idp_len, client_id_list->data + 2); + SILC_GET16_MSB(idp_len, client_id_list.data + 2); idp_len += 4; - client_id = silc_id_payload_parse_id(client_id_list->data, idp_len, NULL); + client_id = silc_id_payload_parse_id(client_id_list.data, idp_len, NULL); if (!client_id) continue; /* Mode */ - SILC_GET32_MSB(mode, client_mode_list->data); + SILC_GET32_MSB(mode, client_mode_list.data); /* 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) { - silc_buffer_pull(client_id_list, idp_len); - silc_buffer_pull(client_mode_list, 4); - continue; - } - client_entry->status |= SILC_CLIENT_STATUS_RESOLVING; + 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)); @@ -1644,8 +1851,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) } silc_free(client_id); - silc_buffer_pull(client_id_list, idp_len); - silc_buffer_pull(client_mode_list, 4); + silc_buffer_pull(&client_id_list, idp_len); + silc_buffer_pull(&client_mode_list, 4); } /* Query the client information from server if the list included clients @@ -1660,7 +1867,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) 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); @@ -1668,36 +1875,77 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) command reply we will reprocess this command reply by re-calling this USERS command reply callback. */ silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident, - silc_client_command_reply_users, cmd); + get_clients, cmd); silc_buffer_free(res_cmd); silc_free(channel_id); silc_free(res_argv); silc_free(res_argv_lens); silc_free(res_argv_types); - if (client_id_list) - silc_buffer_free(client_id_list); - if (client_mode_list) - silc_buffer_free(client_mode_list); - return; + return 1; } - - silc_buffer_push(client_id_list, (client_id_list->data - - client_id_list->head)); - silc_buffer_push(client_mode_list, (client_mode_list->data - - client_mode_list->head)); + + if (wait_res) + return 1; + + silc_buffer_push(&client_id_list, (client_id_list.data - + client_id_list.head)); + silc_buffer_push(&client_mode_list, (client_mode_list.data - + client_mode_list.head)); /* Notify application */ - COMMAND_REPLY((ARGS, channel, list_count, client_id_list, client_mode_list)); + if (notify) + COMMAND_REPLY((SILC_ARGS, channel, list_count, &client_id_list, + &client_mode_list)); + + out: + silc_free(channel_id); + return 0; +} + +/* Reply to USERS command. Received list of client ID's and theirs modes + on the channel we requested. */ + +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, + "Query failed: %s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR(cmd->error); + goto out; + } + + 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; out: SILC_CLIENT_PENDING_EXEC(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 @@ -1712,69 +1960,79 @@ 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; SILC_LOG_DEBUG(("Start")); - if (cmd->status != SILC_STATUS_OK) { + if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, - "%s", silc_client_command_status_message(cmd->status)); - COMMAND_REPLY_ERROR; + "%s", silc_get_status_message(cmd->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; + } + + if (!public_key) { + COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + id_type = silc_id_payload_get_type(idp); if (id_type == SILC_ID_CLIENT) { /* Received client's public key */ client_id = silc_id_payload_get_id(idp); 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); + } + if (!client_entry->public_key) { + client_entry->public_key = public_key; + public_key = NULL; + } + /* Notify application */ - COMMAND_REPLY((ARGS, id_type, client_entry, public_key)); + COMMAND_REPLY((SILC_ARGS, id_type, client_entry, + 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: @@ -1788,6 +2046,32 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) silc_client_command_reply_free(cmd); } +/* Reply to SERVICE command. */ +/* XXX incomplete */ + +SILC_CLIENT_CMD_REPLY_FUNC(service) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcUInt32 tmp_len; + unsigned char *service_list, *name; + + COMMAND_CHECK_STATUS; + + /* Get service list */ + service_list = silc_argument_get_arg_type(cmd->args, 2, &tmp_len); + + /* Get requested service name */ + name = silc_argument_get_arg_type(cmd->args, 3, &tmp_len); + + /* Notify application */ + COMMAND_REPLY((SILC_ARGS, service_list, name)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SERVICE); + err: + silc_client_command_reply_free(cmd); +} + SILC_CLIENT_CMD_REPLY_FUNC(quit) { silc_client_command_reply_free(context); @@ -1805,13 +2089,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->status != SILC_STATUS_OK && - cmd->status != SILC_STATUS_LIST_START && - cmd->status != SILC_STATUS_LIST_ITEM && - cmd->status != SILC_STATUS_LIST_END) - goto out; + COMMAND_CHECK_STATUS_I; /* Save WHOIS info */ silc_client_command_reply_whois_save(cmd, cmd->status, FALSE); @@ -1826,9 +2104,10 @@ 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->status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { SilcClientEntry client_entry; SilcUInt32 tmp_len; unsigned char *tmp = @@ -1859,13 +2138,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->status != SILC_STATUS_OK && - cmd->status != SILC_STATUS_LIST_START && - cmd->status != SILC_STATUS_LIST_ITEM && - cmd->status != SILC_STATUS_LIST_END) - goto out; + COMMAND_CHECK_STATUS_I; /* Save IDENTIFY info */ silc_client_command_reply_identify_save(cmd, cmd->status, FALSE); @@ -1880,9 +2153,10 @@ 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->status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { + if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { SilcClientEntry client_entry; SilcUInt32 tmp_len; unsigned char *tmp = @@ -1918,10 +2192,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(info_i) char *server_name, *server_info; SilcUInt32 len; - SILC_LOG_DEBUG(("Start")); - - if (cmd->status != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Get server ID */ tmp = silc_argument_get_arg_type(cmd->args, 2, &len); @@ -1949,9 +2220,120 @@ 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); +} + +static void silc_client_command_reply_users_i_cb(SilcClient client, + SilcClientConnection conn, + SilcChannelEntry *channels, + SilcUInt32 channels_count, + void *context) +{ + if (!channels_count) { + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + + 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(cmd->error); + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS); + silc_client_command_reply_free(cmd); + return; + } + + silc_client_command_reply_users_i(context, NULL); +} + +SILC_CLIENT_CMD_REPLY_FUNC(users_i) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + + COMMAND_CHECK_STATUS_I; + + /* Save USERS info */ + if (silc_client_command_reply_users_save( + cmd, cmd->status, FALSE, TRUE, + silc_client_command_reply_users_i_cb, + silc_client_command_reply_users_i)) + return; + + 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, + cmd->ident); + + silc_client_command_reply_free(cmd); +} + +/* Private range commands, specific to this implementation (and compatible + with SILC Server >= 0.9). */ + +SILC_CLIENT_CMD_REPLY_FUNC(connect) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_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(cmd->error); + goto out; + } + + /* Notify application */ + COMMAND_REPLY((SILC_ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CONNECT); + silc_client_command_reply_free(cmd); +} + +SILC_CLIENT_CMD_REPLY_FUNC(close) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_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(cmd->error); + goto out; + } + + /* Notify application */ + 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; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_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(cmd->error); + goto out; + } + + /* Notify application */ + COMMAND_REPLY((SILC_ARGS)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_SHUTDOWN); silc_client_command_reply_free(cmd); }