Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2003 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
if (!silc_command_get_status(cmd->payload, NULL, NULL)) { \
if (SILC_STATUS_IS_ERROR(cmd->status)) { \
/* Single error */ \
- COMMAND_REPLY_ERROR; \
+ COMMAND_REPLY_ERROR(cmd->status); \
goto out; \
} \
/* List of errors */ \
- COMMAND_REPLY_ERROR; \
+ COMMAND_REPLY_ERROR(cmd->error); \
if (cmd->status == SILC_STATUS_LIST_END) \
goto out; \
goto err; \
/* No specific identifier for command reply, call first one found */
(*reply)(ctx, NULL);
else
- silc_free(ctx);
+ silc_client_command_reply_free(ctx);
}
}
SILC_LOG_DEBUG(("Command reply context %p refcnt %d->%d", cmd,
cmd->users + 1, cmd->users));
if (cmd->users < 1) {
+ if (cmd->callbacks)
+ silc_free(cmd->callbacks);
silc_command_payload_free(cmd->payload);
silc_free(cmd);
}
}
-static void
+void
silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd,
SilcStatus status,
bool notify)
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;
}
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;
}
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,
nickname, username, realname, mode);
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;
}
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;
}
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;
}
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,
name, info, NULL, 0);
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 {
/* 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;
}
SilcIDPayload idp;
unsigned char *tmp;
SilcUInt32 argc, len;
+ SilcClientID old_client_id;
SILC_LOG_DEBUG(("Start"));
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"Cannot set nickname: %s",
silc_get_status_message(cmd->error));
- COMMAND_REPLY_ERROR;
+ COMMAND_REPLY_ERROR(cmd->error);
goto out;
}
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);
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, strdup(tmp),
- conn->local_entry->id, conn->local_entry, 0, NULL);
+
+ silc_idcache_add(conn->internal->client_cache, tmp,
+ conn->local_entry->id, conn->local_entry, 0, NULL);
}
/* Notify application */
- COMMAND_REPLY((SILC_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);
tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
if (!tmp) {
- COMMAND_REPLY_ERROR;
+ /* 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;
+ 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;
}
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;
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;
}
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((SILC_ARGS, channel, 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 invite: %s", silc_get_status_message(cmd->error));
+ COMMAND_REPLY_ERROR(cmd->error);
goto out;
}
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;
}
{
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((SILC_ARGS));
+ COMMAND_REPLY((SILC_ARGS, client_entry));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL);
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;
}
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;
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- void *id;
+ void *id = NULL;
int i;
time_t diff, curtime;
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;
}
id = silc_id_str2id(cmd->packet->src_id, cmd->packet->src_id_len,
cmd->packet->src_id_type);
if (!id || !conn->internal->ping) {
- COMMAND_REPLY_ERROR;
+ COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS);
goto out;
}
}
}
- silc_free(id);
-
/* Notify application */
COMMAND_REPLY((SILC_ARGS));
out:
+ if (id)
+ silc_free(id);
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING);
silc_client_command_reply_free(cmd);
}
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;
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;
}
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;
}
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;
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;
}
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 (!silc_hmac_alloc(hmac, NULL, &channel->hmac)) {
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;
}
}
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 */
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)
- silc_pkcs_public_key_payload_decode(tmp, len, &founder_key);
+ 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((SILC_ARGS, channel_name, channel, mode, 0,
keyp ? keyp->head : NULL, NULL,
NULL, topic, hmac, list_count, client_id_list,
- client_mode_list, founder_key, tmp ? &chpklist : NULL));
+ 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 (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);
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;
}
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;
}
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;
}
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;
}
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;
}
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)
/* Notify application */
COMMAND_REPLY((SILC_ARGS, channel, mode, public_key,
- tmp ? &channel_pubkeys : NULL));
+ tmp ? &channel_pubkeys : NULL, channel->user_limit));
silc_free(channel_id);
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;
}
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;
}
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;
}
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;
}
{
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((SILC_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);
}
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;
}
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;
}
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;
}
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;
}
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;
}
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;
}
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;
}
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((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);
silc_client_command_reply_free(cmd);
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;
/* 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);
/* 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);
/* 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);
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;
}
goto out;
} else {
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(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS);
goto out;
}
}
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;
}
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;
}
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((SILC_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;
}
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);
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;
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;
}
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;
}
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;
}
projects / silc.git / blobdiff