{ NULL, 0 },
};
-/* Status message structure. Messages are defined below. */
-typedef struct {
- SilcCommandStatus status;
- char *message;
-} SilcCommandStatusMessage;
-
-/* Status messages returned by the server */
-#define STAT(x) SILC_STATUS_ERR_##x
const SilcCommandStatusMessage silc_command_status_messages[] = {
- { STAT(NO_SUCH_NICK), "No such nickname" },
- { STAT(NO_SUCH_CHANNEL), "No such channel" },
+ { STAT(NO_SUCH_NICK), "There was no such nickname" },
+ { STAT(NO_SUCH_CHANNEL), "There was no such channel" },
{ STAT(NO_SUCH_SERVER), "No such server" },
{ STAT(TOO_MANY_TARGETS), "Duplicate recipients. No message delivered" },
{ STAT(NO_RECIPIENT), "No recipient given" },
{ STAT(NOT_REGISTERED), "You have not registered" },
{ STAT(NOT_ENOUGH_PARAMS), "Not enough parameters" },
{ STAT(TOO_MANY_PARAMS), "Too many parameters" },
- { STAT(PERM_DENIED), "Your host is not among the privileged" },
+ { STAT(PERM_DENIED), "Permission denied" },
{ STAT(BANNED_FROM_SERVER),"You are banned from this server" },
{ STAT(BAD_PASSWORD), "Cannot join channel. Incorrect password" },
{ STAT(CHANNEL_IS_FULL), "Cannot join channel. Channel is full" },
{ 0, NULL }
};
-
/* Command reply operation that is called at the end of all command replys.
Usage: COMMAND_REPLY((ARGS, argument1, argument2, etc...)), */
#define COMMAND_REPLY(args) cmd->client->ops->command_reply args
/* Returns status message string */
-static char *
-silc_client_command_status_message(SilcCommandStatus status)
+char *silc_client_command_status_message(SilcCommandStatus status)
{
int i;
unsigned char *id_data, *tmp;
char *nickname = NULL, *username = NULL;
char *realname = NULL;
- unsigned int idle = 0;
+ unsigned int idle = 0, mode = 0;
+ SilcBuffer channels = NULL;
argc = silc_argument_get_arg_num(cmd->args);
return;
}
+ tmp = silc_argument_get_arg_type(cmd->args, 6, &len);
+ if (tmp) {
+ channels = silc_buffer_alloc(len);
+ silc_buffer_pull_tail(channels, SILC_BUFFER_END(channels));
+ silc_buffer_put(channels, tmp, len);
+ }
+
tmp = silc_argument_get_arg_type(cmd->args, 7, &len);
+ if (tmp)
+ SILC_GET32_MSB(mode, tmp);
+
+ tmp = silc_argument_get_arg_type(cmd->args, 8, &len);
if (tmp)
SILC_GET32_MSB(idle, tmp);
client_entry->username = strdup(username);
if (realname)
client_entry->realname = strdup(realname);
+ client_entry->mode = mode;
/* Add client to cache */
silc_idcache_add(conn->client_cache, client_entry->nickname,
- SILC_ID_CLIENT, client_id, (void *)client_entry, TRUE);
+ SILC_ID_CLIENT, client_id, (void *)client_entry,
+ TRUE, FALSE);
} else {
client_entry = (SilcClientEntry)id_cache->context;
if (client_entry->nickname)
silc_free(client_entry->username);
if (client_entry->realname)
silc_free(client_entry->realname);
+ client_entry->mode = mode;
SILC_LOG_DEBUG(("Updating client entry"));
/* Notify application */
if (!cmd->callback)
COMMAND_REPLY((ARGS, client_entry, nickname, username, realname,
- NULL, idle));
+ channels, mode, idle));
+
+ if (channels)
+ silc_buffer_free(channels);
}
/* Received reply for WHOIS command. This maybe called several times
SILC_CLIENT_CMD_REPLY_FUNC(whois)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
- SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcCommandStatus status;
unsigned char *tmp;
status != SILC_STATUS_LIST_START &&
status != SILC_STATUS_LIST_ITEM &&
status != SILC_STATUS_LIST_END) {
- if (status == SILC_STATUS_ERR_NO_SUCH_NICK) {
- /* Take nickname which may be provided */
- tmp = silc_argument_get_arg_type(cmd->args, 3, NULL);
- if (tmp)
- cmd->client->ops->say(cmd->client, conn, "%s: %s", tmp,
- silc_client_command_status_message(status));
- else
- cmd->client->ops->say(cmd->client, conn, "%s",
- silc_client_command_status_message(status));
- COMMAND_REPLY_ERROR;
- goto out;
- } else {
- cmd->client->ops->say(cmd->client, conn,
- "%s", silc_client_command_status_message(status));
- COMMAND_REPLY_ERROR;
- goto out;
- }
+ COMMAND_REPLY_ERROR;
+ goto out;
}
/* Display one whois reply */
SILC_CLIENT_CMD_REPLY_FUNC(whowas)
{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcCommandStatus status;
+ SilcClientID *client_id;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcClientEntry client_entry = NULL;
+ unsigned int len;
+ unsigned char *id_data, *tmp;
+ char *nickname, *username;
+ char *realname = NULL;
+
+ SILC_LOG_DEBUG(("Start"));
+
+ tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
+ SILC_GET16_MSB(status, tmp);
+ if (status != SILC_STATUS_OK &&
+ status != SILC_STATUS_LIST_START &&
+ status != SILC_STATUS_LIST_ITEM &&
+ status != SILC_STATUS_LIST_END) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ id_data = silc_argument_get_arg_type(cmd->args, 2, &len);
+ if (!id_data) {
+ COMMAND_REPLY_ERROR;
+ return;
+ }
+
+ client_id = silc_id_payload_parse_id(id_data, len);
+ if (!client_id) {
+ COMMAND_REPLY_ERROR;
+ return;
+ }
+
+ /* Get the client entry, if exists */
+ if (silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
+ SILC_ID_CLIENT, &id_cache))
+ client_entry = (SilcClientEntry)id_cache->context;
+ silc_free(client_id);
+
+ nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
+ username = silc_argument_get_arg_type(cmd->args, 4, &len);
+ realname = silc_argument_get_arg_type(cmd->args, 5, &len);
+ if (!nickname || !username) {
+ COMMAND_REPLY_ERROR;
+ return;
+ }
+ /* Notify application. We don't save any history information to any
+ cache. Just pass the data to the application for displaying on
+ the screen. */
+ COMMAND_REPLY((ARGS, client_entry, nickname, username, realname));
+
+ /* Pending callbacks are not executed if this was an list entry */
+ if (status != SILC_STATUS_OK &&
+ status != SILC_STATUS_LIST_END) {
+ silc_client_command_reply_free(cmd);
+ return;
+ }
+
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
+ out:
+ SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
+ silc_client_command_reply_free(cmd);
}
static void
/* Add client to cache */
silc_idcache_add(conn->client_cache, client_entry->nickname,
- SILC_ID_CLIENT, client_id, (void *)client_entry, TRUE);
+ SILC_ID_CLIENT, client_id, (void *)client_entry,
+ TRUE, FALSE);
} else {
client_entry = (SilcClientEntry)id_cache->context;
if (client_entry->nickname)
SILC_CLIENT_CMD_REPLY_FUNC(identify)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
- SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcCommandStatus status;
unsigned char *tmp;
status != SILC_STATUS_LIST_START &&
status != SILC_STATUS_LIST_ITEM &&
status != SILC_STATUS_LIST_END) {
- if (status == SILC_STATUS_ERR_NO_SUCH_NICK) {
- /* Take nickname which may be provided */
- tmp = silc_argument_get_arg_type(cmd->args, 3, NULL);
- if (tmp)
- cmd->client->ops->say(cmd->client, conn, "%s: %s", tmp,
- silc_client_command_status_message(status));
- else
- cmd->client->ops->say(cmd->client, conn, "%s",
- silc_client_command_status_message(status));
- COMMAND_REPLY_ERROR;
- goto out;
- } else {
- cmd->client->ops->say(cmd->client, conn,
- "%s", silc_client_command_status_message(status));
- COMMAND_REPLY_ERROR;
- goto out;
- }
+ COMMAND_REPLY_ERROR;
+ goto out;
}
/* Save one IDENTIFY entry */
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INVITE);
silc_client_command_reply_free(cmd);
}
+
+/* Received reply to the KILL command. */
SILC_CLIENT_CMD_REPLY_FUNC(kill)
{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcCommandStatus status;
+ unsigned char *tmp;
+
+ tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
+ SILC_GET16_MSB(status, tmp);
+ if (status != SILC_STATUS_OK) {
+ cmd->client->ops->say(cmd->client, conn,
+ "%s", silc_client_command_status_message(status));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS));
+
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL);
+
+ out:
+ SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KILL);
+ silc_client_command_reply_free(cmd);
}
/* Received reply to INFO command. We receive the server ID and some
client_entry = silc_calloc(1, sizeof(*client_entry));
client_entry->id = silc_id_dup(client_id, SILC_ID_CLIENT);
silc_idcache_add(conn->client_cache, NULL, SILC_ID_CLIENT,
- client_entry->id, (void *)client_entry, FALSE);
+ client_entry->id, (void *)client_entry, FALSE, FALSE);
} else {
/* Yes, we have it already */
client_entry = (SilcClientEntry)id_cache->context;
silc_client_command_reply_free(cmd);
}
+/* Received reply tot he UMODE command. Save the current user mode */
+
SILC_CLIENT_CMD_REPLY_FUNC(umode)
{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcCommandStatus status;
+ unsigned char *tmp;
+ unsigned int mode;
+
+ tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
+ SILC_GET16_MSB(status, tmp);
+ if (status != SILC_STATUS_OK) {
+ cmd->client->ops->say(cmd->client, conn,
+ "%s", silc_client_command_status_message(status));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ tmp = silc_argument_get_arg_type(cmd->args, 2, NULL);
+ if (!tmp) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ SILC_GET32_MSB(mode, tmp);
+ conn->local_entry->mode = mode;
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, mode));
+
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE);
+
+ out:
+ SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_UMODE);
+ silc_client_command_reply_free(cmd);
}
/* Received reply for CMODE command. */
SILC_CLIENT_CMD_REPLY_FUNC(silcoper)
{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcCommandStatus status;
+ unsigned char *tmp;
+
+ tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
+ SILC_GET16_MSB(status, tmp);
+ if (status != SILC_STATUS_OK) {
+ cmd->client->ops->say(cmd->client, conn,
+ "%s", silc_client_command_status_message(status));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS));
+
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER);
+
+ out:
+ SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SILCOPER);
+ silc_client_command_reply_free(cmd);
}
SILC_CLIENT_CMD_REPLY_FUNC(oper)
{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcCommandStatus status;
+ unsigned char *tmp;
+
+ tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
+ SILC_GET16_MSB(status, tmp);
+ if (status != SILC_STATUS_OK) {
+ cmd->client->ops->say(cmd->client, conn,
+ "%s", silc_client_command_status_message(status));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS));
+
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER);
+
+ out:
+ SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_OPER);
+ silc_client_command_reply_free(cmd);
}
SILC_CLIENT_CMD_REPLY_FUNC(connect)