X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand.c;h=2a388e96459215d6f69dc6448a17747e27ff65ca;hp=f6dca33316e8e9cba3d61259cebb3fbef7e2a8f9;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hpb=183d9fe2d3a82778e110490a74425776743e74b4 diff --git a/lib/silcclient/command.c b/lib/silcclient/command.c index f6dca333..2a388e96 100644 --- a/lib/silcclient/command.c +++ b/lib/silcclient/command.c @@ -1,16 +1,15 @@ /* - command.c + command.c - Author: Pekka Riikonen + Author: Pekka Riikonen - Copyright (C) 1997 - 2001 Pekka Riikonen + Copyright (C) 1997 - 2002 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + the Free Software Foundation; version 2 of the License. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -19,68 +18,31 @@ */ /* $Id$ */ -#include "clientlibincludes.h" +#include "silcincludes.h" +#include "silcclient.h" #include "client_internal.h" -/* Client command list. */ -SilcClientCommand silc_command_list[] = -{ - SILC_CLIENT_CMD(whois, WHOIS, "WHOIS", SILC_CF_LAG | SILC_CF_REG, 3), - SILC_CLIENT_CMD(whowas, WHOWAS, "WHOWAS", SILC_CF_LAG | SILC_CF_REG, 3), - SILC_CLIENT_CMD(identify, IDENTIFY, "IDENTIFY", - SILC_CF_LAG | SILC_CF_REG, 3), - SILC_CLIENT_CMD(nick, NICK, "NICK", SILC_CF_LAG | SILC_CF_REG, 2), - SILC_CLIENT_CMD(list, LIST, "LIST", SILC_CF_LAG | SILC_CF_REG, 2), - SILC_CLIENT_CMD(topic, TOPIC, "TOPIC", SILC_CF_LAG | SILC_CF_REG, 3), - SILC_CLIENT_CMD(invite, INVITE, "INVITE", SILC_CF_LAG | SILC_CF_REG, 3), - SILC_CLIENT_CMD(quit, QUIT, "QUIT", SILC_CF_LAG | SILC_CF_REG, 2), - SILC_CLIENT_CMD(kill, KILL, "KILL", - SILC_CF_LAG | SILC_CF_REG | SILC_CF_OPER, 3), - SILC_CLIENT_CMD(info, INFO, "INFO", SILC_CF_LAG | SILC_CF_REG, 2), - SILC_CLIENT_CMD(connect, CONNECT, "CONNECT", - SILC_CF_LAG | SILC_CF_REG | SILC_CF_OPER, 3), - SILC_CLIENT_CMD(ping, PING, "PING", SILC_CF_LAG | SILC_CF_REG, 2), - SILC_CLIENT_CMD(oper, OPER, "OPER", - SILC_CF_LAG | SILC_CF_REG | SILC_CF_OPER, 2), - SILC_CLIENT_CMD(join, JOIN, "JOIN", SILC_CF_LAG | SILC_CF_REG, 5), - SILC_CLIENT_CMD(motd, MOTD, "MOTD", SILC_CF_LAG | SILC_CF_REG, 2), - SILC_CLIENT_CMD(umode, UMODE, "UMODE", SILC_CF_LAG | SILC_CF_REG, 2), - SILC_CLIENT_CMD(cmode, CMODE, "CMODE", SILC_CF_LAG | SILC_CF_REG, 4), - SILC_CLIENT_CMD(cumode, CUMODE, "CUMODE", SILC_CF_LAG | SILC_CF_REG, 5), - SILC_CLIENT_CMD(kick, KICK, "KICK", SILC_CF_LAG | SILC_CF_REG, 4), - SILC_CLIENT_CMD(restart, RESTART, "RESTART", - SILC_CF_LAG | SILC_CF_REG | SILC_CF_OPER, 2), - SILC_CLIENT_CMD(close, CLOSE, "CLOSE", - SILC_CF_LAG | SILC_CF_REG | SILC_CF_OPER, 3), - SILC_CLIENT_CMD(shutdown, SHUTDOWN, "SHUTDOWN", - SILC_CF_LAG | SILC_CF_REG | SILC_CF_OPER, 1), - SILC_CLIENT_CMD(silcoper, SILCOPER, "SILCOPER", - SILC_CF_LAG | SILC_CF_REG | SILC_CF_SILC_OPER, 3), - SILC_CLIENT_CMD(leave, LEAVE, "LEAVE", SILC_CF_LAG | SILC_CF_REG, 2), - SILC_CLIENT_CMD(users, USERS, "USERS", SILC_CF_LAG | SILC_CF_REG, 2), - - { NULL, 0, NULL, 0, 0 }, -}; - #define SILC_NOT_CONNECTED(x, c) \ - x->ops->say((x), (c), \ + x->internal->ops->say((x), (c), SILC_CLIENT_MESSAGE_ERROR, \ "You are not connected to a server, use /SERVER to connect"); /* Command operation that is called at the end of all commands. Usage: COMMAND; */ -#define COMMAND cmd->client->ops->command(cmd->client, cmd->conn, \ +#define COMMAND cmd->client->internal->ops->command(cmd->client, cmd->conn, \ cmd, TRUE, cmd->command->cmd) /* Error to application. Usage: COMMAND_ERROR; */ -#define COMMAND_ERROR cmd->client->ops->command(cmd->client, cmd->conn, \ - cmd, FALSE, cmd->command->cmd) +#define COMMAND_ERROR cmd->client->internal->ops->command(cmd->client, \ + cmd->conn, cmd, FALSE, cmd->command->cmd) + +#define SAY cmd->client->internal->ops->say /* Generic function to send any command. The arguments must be sent already encoded into correct form and in correct order. */ -void silc_client_send_command(SilcClient client, SilcClientConnection conn, - SilcCommand command, unsigned short ident, - unsigned int argc, ...) +void silc_client_command_send(SilcClient client, SilcClientConnection conn, + SilcCommand command, SilcUInt16 ident, + SilcUInt32 argc, ...) { SilcBuffer packet; va_list ap; @@ -97,18 +59,32 @@ void silc_client_send_command(SilcClient client, SilcClientConnection conn, /* Finds and returns a pointer to the command list. Return NULL if the command is not found. */ -SilcClientCommand *silc_client_command_find(const char *name) +SilcClientCommand silc_client_command_find(SilcClient client, + const char *name) { - SilcClientCommand *cmd; + SilcClientCommand cmd; - for (cmd = silc_command_list; cmd->name; cmd++) { - if (!strcmp(cmd->name, name)) + silc_list_start(client->internal->commands); + while ((cmd = silc_list_get(client->internal->commands)) != SILC_LIST_END) { + if (cmd->name && !strcmp(cmd->name, name)) return cmd; } return NULL; } +/* Calls the command (executes it). Application can call this after + it has allocated the SilcClientCommandContext with the function + silc_client_command_alloc and found the command from the client + library by calling silc_client_command_find. This will execute + the command. */ + +void silc_client_command_call(SilcClientCommand command, + SilcClientCommandContext cmd) +{ + (*command->command)((void *)cmd, NULL); +} + /* Add new pending command to be executed when reply to a command has been received. The `reply_cmd' is the command that will call the `callback' with `context' when reply has been received. If `ident is non-zero @@ -117,8 +93,7 @@ SilcClientCommand *silc_client_command_find(const char *name) void silc_client_command_pending(SilcClientConnection conn, SilcCommand reply_cmd, - unsigned short ident, - SilcClientPendingDestructor destructor, + SilcUInt16 ident, SilcCommandCb callback, void *context) { @@ -129,7 +104,6 @@ void silc_client_command_pending(SilcClientConnection conn, reply->ident = ident; reply->context = context; reply->callback = callback; - reply->destructor = destructor; silc_dlist_add(conn->pending_commands, reply); } @@ -137,7 +111,7 @@ void silc_client_command_pending(SilcClientConnection conn, void silc_client_command_pending_del(SilcClientConnection conn, SilcCommand reply_cmd, - unsigned short ident) + SilcUInt16 ident) { SilcClientCommandPending *r; @@ -156,7 +130,7 @@ void silc_client_command_pending_del(SilcClientConnection conn, int silc_client_command_pending_check(SilcClientConnection conn, SilcClientCommandReplyContext ctx, SilcCommand command, - unsigned short ident) + SilcUInt16 ident) { SilcClientCommandPending *r; @@ -165,7 +139,6 @@ int silc_client_command_pending_check(SilcClientConnection conn, if (r->reply_cmd == command && r->ident == ident) { ctx->context = r->context; ctx->callback = r->callback; - ctx->destructor = r->destructor; ctx->ident = ident; return TRUE; } @@ -176,7 +149,7 @@ int silc_client_command_pending_check(SilcClientConnection conn, /* Allocate Command Context */ -SilcClientCommandContext silc_client_command_alloc() +SilcClientCommandContext silc_client_command_alloc(void) { SilcClientCommandContext ctx = silc_calloc(1, sizeof(*ctx)); ctx->users++; @@ -195,6 +168,8 @@ void silc_client_command_free(SilcClientCommandContext ctx) for (i = 0; i < ctx->argc; i++) silc_free(ctx->argv[i]); + silc_free(ctx->argv_lens); + silc_free(ctx->argv_types); silc_free(ctx); } } @@ -210,23 +185,6 @@ SilcClientCommandContext silc_client_command_dup(SilcClientCommandContext ctx) return ctx; } -/* Pending command destructor. */ - -static void silc_client_command_destructor(void *context) -{ - silc_client_command_free((SilcClientCommandContext)context); -} - -/* silc_client_get_client completion callback */ -void silc_client_command_completion(SilcClient client, - SilcClientConnection conn, - SilcClientEntry clients, - unsigned int clients_count, - void *context) -{ - -} - /* Command WHOIS. This command is used to query information about specific user. */ @@ -242,10 +200,13 @@ SILC_CLIENT_CMD_FUNC(whois) goto out; } - if (cmd->argc < 2 || cmd->argc > 3) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /WHOIS [@] []"); - COMMAND_ERROR; + /* Given without arguments fetches client's own information */ + if (cmd->argc < 2) { + buffer = silc_id_payload_encode(cmd->conn->local_id, SILC_ID_CLIENT); + silc_client_command_send(cmd->client, cmd->conn, SILC_COMMAND_WHOIS, + ++conn->cmd_ident, + 1, 3, buffer->data, buffer->len); + silc_buffer_free(buffer); goto out; } @@ -284,8 +245,8 @@ SILC_CLIENT_CMD_FUNC(whowas) } if (cmd->argc < 2 || cmd->argc > 3) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /WHOWAS [@] []"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /WHOWAS [@] []"); COMMAND_ERROR; goto out; } @@ -310,7 +271,10 @@ SILC_CLIENT_CMD_FUNC(whowas) } /* Command IDENTIFY. This command is used to query information about - specific user, especially ID's. */ + specific user, especially ID's. + + NOTE: This command is used only internally by the client library + and application MUST NOT call this command directly. */ SILC_CLIENT_CMD_FUNC(identify) { @@ -320,36 +284,65 @@ SILC_CLIENT_CMD_FUNC(identify) if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); - COMMAND_ERROR; goto out; } - if (cmd->argc < 2 || cmd->argc > 3) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /IDENTIFY [@] []"); - COMMAND_ERROR; + if (cmd->argc < 2 || cmd->argc > 3) goto out; - } - buffer = silc_command_payload_encode(SILC_COMMAND_IDENTIFY, - cmd->argc - 1, ++cmd->argv, - ++cmd->argv_lens, ++cmd->argv_types, - ++conn->cmd_ident); + if (cmd->argc == 2) + buffer = silc_command_payload_encode_va(SILC_COMMAND_IDENTIFY, + ++conn->cmd_ident, 1, + 1, cmd->argv[1], + cmd->argv_lens[1]); + else + buffer = silc_command_payload_encode_va(SILC_COMMAND_IDENTIFY, + ++conn->cmd_ident, 2, + 1, cmd->argv[1], + cmd->argv_lens[1], + 4, cmd->argv[2], + cmd->argv_lens[2]); + silc_client_packet_send(cmd->client, cmd->conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); - cmd->argv--; - cmd->argv_lens--; - cmd->argv_types--; - - /* Notify application */ - COMMAND; out: silc_client_command_free(cmd); } +/* Pending callbcak that will be called after the NICK command was + replied by the server. This sets the nickname if there were no + errors. */ + +SILC_CLIENT_CMD_FUNC(nick_change) +{ + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClientConnection conn = cmd->conn; + SilcClientCommandReplyContext reply = + (SilcClientCommandReplyContext)context2; + SilcCommandStatus status; + + SILC_GET16_MSB(status, silc_argument_get_arg_type(reply->args, 1, NULL)); + if (status == SILC_STATUS_OK) { + /* Set the nickname */ + silc_idcache_del_by_context(conn->client_cache, conn->local_entry); + if (conn->nickname) + silc_free(conn->nickname); + conn->nickname = strdup(cmd->argv[1]); + conn->local_entry->nickname = conn->nickname; + silc_client_nickname_format(cmd->client, conn, conn->local_entry); + silc_idcache_add(conn->client_cache, strdup(cmd->argv[1]), + conn->local_entry->id, conn->local_entry, 0, NULL); + COMMAND; + } else { + COMMAND_ERROR; + } + + silc_client_command_free(cmd); +} + /* Command NICK. Shows current nickname/sets new nickname on current window. */ @@ -365,50 +358,104 @@ SILC_CLIENT_CMD_FUNC(nick) goto out; } + if (cmd->argc < 2) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /NICK "); + COMMAND_ERROR; + goto out; + } + if (!strcmp(conn->nickname, cmd->argv[1])) goto out; /* Show current nickname */ if (cmd->argc < 2) { if (cmd->conn) { - cmd->client->ops->say(cmd->client, conn, - "Your nickname is %s on server %s", - conn->nickname, conn->remote_host); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Your nickname is %s on server %s", + conn->nickname, conn->remote_host); } else { - cmd->client->ops->say(cmd->client, conn, - "Your nickname is %s", conn->nickname); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Your nickname is %s", conn->nickname); } - /* XXX Notify application */ COMMAND; goto out; } - /* Set new nickname */ - buffer = silc_command_payload_encode(SILC_COMMAND_NICK, - cmd->argc - 1, ++cmd->argv, - ++cmd->argv_lens, ++cmd->argv_types, + if (cmd->argv_lens[1] > 128) + cmd->argv_lens[1] = 128; + + /* Send the NICK command */ + buffer = silc_command_payload_encode(SILC_COMMAND_NICK, 1, + &cmd->argv[1], + &cmd->argv_lens[1], + &cmd->argv_types[1], ++cmd->conn->cmd_ident); silc_client_packet_send(cmd->client, cmd->conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); - cmd->argv--; - cmd->argv_lens--; - cmd->argv_types--; - if (conn->nickname) - silc_free(conn->nickname); - conn->nickname = strdup(cmd->argv[1]); - /* Notify application */ - COMMAND; + /* Register pending callback that will actually set the new nickname + if there were no errors returned by the server. */ + silc_client_command_pending(conn, SILC_COMMAND_NICK, + cmd->conn->cmd_ident, + silc_client_command_nick_change, + silc_client_command_dup(cmd)); + cmd->pending = TRUE; out: silc_client_command_free(cmd); } +/* Command LIST. Lists channels on the current server. */ + SILC_CLIENT_CMD_FUNC(list) { + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClientConnection conn = cmd->conn; + SilcIDCacheEntry id_cache = NULL; + SilcChannelEntry channel; + SilcBuffer buffer, idp = NULL; + char *name; + + if (!cmd->conn) { + SILC_NOT_CONNECTED(cmd->client, cmd->conn); + COMMAND_ERROR; + goto out; + } + + if (cmd->argc == 2) { + name = cmd->argv[1]; + + /* Get the Channel ID of the channel */ + if (silc_idcache_find_by_name_one(conn->channel_cache, name, &id_cache)) { + channel = (SilcChannelEntry)id_cache->context; + idp = silc_id_payload_encode(id_cache->id, SILC_ID_CHANNEL); + } + } + + if (!idp) + buffer = silc_command_payload_encode_va(SILC_COMMAND_LIST, + ++conn->cmd_ident, 0); + else + buffer = silc_command_payload_encode_va(SILC_COMMAND_LIST, + ++conn->cmd_ident, 1, + 1, idp->data, idp->len); + + silc_client_packet_send(cmd->client, cmd->conn->sock, + SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, + buffer->data, buffer->len, TRUE); + silc_buffer_free(buffer); + if (idp) + silc_buffer_free(idp); + + /* Notify application */ + COMMAND; + + out: + silc_client_command_free(cmd); } /* Command TOPIC. Sets/shows topic on a channel. */ @@ -429,15 +476,16 @@ SILC_CLIENT_CMD_FUNC(topic) } if (cmd->argc < 2 || cmd->argc > 3) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /TOPIC []"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /TOPIC []"); COMMAND_ERROR; goto out; } if (cmd->argv[1][0] == '*') { if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on any channel"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on any channel"); COMMAND_ERROR; goto out; } @@ -447,14 +495,16 @@ SILC_CLIENT_CMD_FUNC(topic) } if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on that channel"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on that channel"); COMMAND_ERROR; goto out; } /* Get the Channel ID of the channel */ - if (!silc_idcache_find_by_data_one(conn->channel_cache, name, &id_cache)) { - cmd->client->ops->say(cmd->client, conn, "You are not on that channel"); + if (!silc_idcache_find_by_name_one(conn->channel_cache, name, &id_cache)) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on that channel"); COMMAND_ERROR; goto out; } @@ -464,14 +514,15 @@ SILC_CLIENT_CMD_FUNC(topic) /* Send TOPIC command to the server */ idp = silc_id_payload_encode(id_cache->id, SILC_ID_CHANNEL); if (cmd->argc > 2) - buffer = silc_command_payload_encode_va(SILC_COMMAND_TOPIC, 0, 2, + buffer = silc_command_payload_encode_va(SILC_COMMAND_TOPIC, + ++conn->cmd_ident, 2, 1, idp->data, idp->len, 2, cmd->argv[2], strlen(cmd->argv[2])); else - buffer = silc_command_payload_encode_va(SILC_COMMAND_TOPIC, 1, - 1, idp->data, idp->len, - 0); + buffer = silc_command_payload_encode_va(SILC_COMMAND_TOPIC, + ++conn->cmd_ident, 1, + 1, idp->data, idp->len); silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); @@ -484,18 +535,20 @@ SILC_CLIENT_CMD_FUNC(topic) silc_client_command_free(cmd); } -/* Command INVITE. Invites specific client to join a channel. */ +/* Command INVITE. Invites specific client to join a channel. This is + also used to mange the invite list of the channel. */ SILC_CLIENT_CMD_FUNC(invite) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; SilcClient client = cmd->client; SilcClientConnection conn = cmd->conn; - SilcClientEntry client_entry; - SilcChannelEntry channel_entry; + SilcClientEntry client_entry = NULL; + SilcChannelEntry channel; SilcBuffer buffer, clidp, chidp; - unsigned int num = 0; - char *nickname = NULL, *server = NULL; + SilcUInt32 type = 0; + char *nickname = NULL, *name; + char *invite = NULL; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -503,71 +556,100 @@ SILC_CLIENT_CMD_FUNC(invite) goto out; } - if (cmd->argc != 3) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /INVITE [@] "); + if (cmd->argc < 2) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /INVITE [[@server>]" + "[+|-[[@[![@hostname>]]]]]"); COMMAND_ERROR; goto out; } - /* Parse the typed nickname. */ - if (!silc_parse_nickname(cmd->argv[1], &nickname, &server, &num)) { - cmd->client->ops->say(cmd->client, conn, "Bad nickname"); - COMMAND_ERROR; - goto out; - } + if (cmd->argv[1][0] == '*') { + if (!conn->current_channel) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on any channel"); + COMMAND_ERROR; + goto out; + } - /* Find client entry */ - client_entry = silc_idlist_get_client(client, conn, nickname, server, num, - TRUE); - if (!client_entry) { - if (nickname) - silc_free(nickname); - if (server) - silc_free(server); + channel = conn->current_channel; + } else { + name = cmd->argv[1]; - /* Client entry not found, it was requested thus mark this to be - pending command. */ - silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident, - silc_client_command_destructor, - silc_client_command_invite, - silc_client_command_dup(cmd)); - cmd->pending = 1; - return; + channel = silc_client_get_channel(cmd->client, conn, name); + if (!channel) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are on that channel"); + COMMAND_ERROR; + goto out; + } } - /* Find channel entry */ - channel_entry = silc_client_get_channel(client, conn, cmd->argv[2]); - if (!channel_entry) { - cmd->client->ops->say(cmd->client, conn, "You are not on that channel"); - COMMAND_ERROR; - goto out; + /* Parse the typed nickname. */ + if (cmd->argc == 3) { + if (cmd->argv[2][0] != '+' && cmd->argv[2][0] != '-') { + if (client->internal->params->nickname_parse) + client->internal->params->nickname_parse(cmd->argv[2], &nickname); + else + nickname = strdup(cmd->argv[2]); + + /* Find client entry */ + client_entry = silc_idlist_get_client(client, conn, nickname, + cmd->argv[2], TRUE); + if (!client_entry) { + if (cmd->pending) { + COMMAND_ERROR; + goto out; + } + + /* Client entry not found, it was requested thus mark this to be + pending command. */ + silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, + conn->cmd_ident, + silc_client_command_invite, + silc_client_command_dup(cmd)); + cmd->pending = 1; + goto out; + } + } else { + invite = cmd->argv[2]; + invite++; + if (cmd->argv[2][0] == '+') + type = 3; + else + type = 4; + } + } + + /* Send the command */ + chidp = silc_id_payload_encode(channel->id, SILC_ID_CHANNEL); + if (client_entry) { + clidp = silc_id_payload_encode(client_entry->id, SILC_ID_CLIENT); + buffer = silc_command_payload_encode_va(SILC_COMMAND_INVITE, + ++conn->cmd_ident, 3, + 1, chidp->data, chidp->len, + 2, clidp->data, clidp->len, + type, invite, invite ? + strlen(invite) : 0); + silc_buffer_free(clidp); + } else { + buffer = silc_command_payload_encode_va(SILC_COMMAND_INVITE, + ++conn->cmd_ident, 2, + 1, chidp->data, chidp->len, + type, invite, invite ? + strlen(invite) : 0); } - /* Send command */ - clidp = silc_id_payload_encode(client_entry->id, SILC_ID_CLIENT); - chidp = silc_id_payload_encode(channel_entry->id, SILC_ID_CHANNEL); - buffer = silc_command_payload_encode_va(SILC_COMMAND_INVITE, 0, 2, - 1, clidp->data, clidp->len, - 2, chidp->data, chidp->len); silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); - silc_buffer_free(clidp); silc_buffer_free(chidp); - cmd->client->ops->say(cmd->client, conn, - "Inviting %s to channel %s", cmd->argv[1], - cmd->argv[2]); - /* Notify application */ COMMAND; out: - if (nickname) - silc_free(nickname); - if (server) - silc_free(server); + silc_free(nickname); silc_client_command_free(cmd); } @@ -581,8 +663,8 @@ SILC_TASK_CALLBACK(silc_client_command_quit_cb) QuitInternal q = (QuitInternal)context; /* Close connection */ - q->client->ops->disconnect(q->client, q->conn); - silc_client_close_connection(q->client, q->conn->sock->user_data); + q->client->internal->ops->disconnect(q->client, q->conn); + silc_client_close_connection(q->client, NULL, q->conn->sock->user_data); silc_free(q); } @@ -617,10 +699,13 @@ SILC_CLIENT_CMD_FUNC(quit) q->client = cmd->client; q->conn = cmd->conn; + /* Sleep for a while */ + sleep(2); + /* We quit the connection with little timeout */ - silc_task_register(cmd->client->timeout_queue, cmd->conn->sock->sock, - silc_client_command_quit_cb, (void *)q, - 1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); + silc_schedule_task_add(cmd->client->schedule, cmd->conn->sock->sock, + silc_client_command_quit_cb, (void *)q, + 1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); /* Notify application */ COMMAND; @@ -629,17 +714,66 @@ SILC_CLIENT_CMD_FUNC(quit) silc_client_command_free(cmd); } +/* Timeout callback to remove the killed client from cache */ + +SILC_TASK_CALLBACK(silc_client_command_kill_remove_later) +{ + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClient client = cmd->client; + SilcClientConnection conn = cmd->conn; + SilcClientEntry target; + char *nickname = NULL; + + /* Parse the typed nickname. */ + if (client->internal->params->nickname_parse) + client->internal->params->nickname_parse(cmd->argv[1], &nickname); + else + nickname = strdup(cmd->argv[1]); + + /* Get the target client */ + target = silc_idlist_get_client(cmd->client, conn, nickname, + cmd->argv[1], FALSE); + if (target) + /* Remove the client from all channels and free it */ + silc_client_del_client(client, conn, target); + + silc_free(nickname); + silc_client_command_free(cmd); +} + +/* Kill command's pending command callback to actually remove the killed + client from our local cache. */ + +SILC_CLIENT_CMD_FUNC(kill_remove) +{ + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClientCommandReplyContext reply = + (SilcClientCommandReplyContext)context2; + SilcCommandStatus status; + + SILC_GET16_MSB(status, silc_argument_get_arg_type(reply->args, 1, NULL)); + if (status == SILC_STATUS_OK) { + /* Remove with timeout */ + silc_schedule_task_add(cmd->client->schedule, cmd->conn->sock->sock, + silc_client_command_kill_remove_later, context, + 1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); + return; + } + + silc_client_command_free(cmd); +} + /* Command KILL. Router operator can use this command to remove an client fromthe SILC Network. */ SILC_CLIENT_CMD_FUNC(kill) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClient client = cmd->client; SilcClientConnection conn = cmd->conn; SilcBuffer buffer, idp; SilcClientEntry target; - unsigned int num = 0; - char *nickname = NULL, *server = NULL; + char *nickname = NULL; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -648,45 +782,46 @@ SILC_CLIENT_CMD_FUNC(kill) } if (cmd->argc < 2) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /KILL []"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /KILL []"); COMMAND_ERROR; goto out; } /* Parse the typed nickname. */ - if (!silc_parse_nickname(cmd->argv[1], &nickname, &server, &num)) { - cmd->client->ops->say(cmd->client, conn, "Bad nickname"); - COMMAND_ERROR; - goto out; - } + if (client->internal->params->nickname_parse) + client->internal->params->nickname_parse(cmd->argv[1], &nickname); + else + nickname = strdup(cmd->argv[1]); /* Get the target client */ target = silc_idlist_get_client(cmd->client, conn, nickname, - server, num, TRUE); + cmd->argv[1], TRUE); if (!target) { - silc_free(nickname); - if (server) - silc_free(server); + if (cmd->pending) { + COMMAND_ERROR; + goto out; + } /* Client entry not found, it was requested thus mark this to be pending command. */ silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident, - silc_client_command_destructor, silc_client_command_kill, silc_client_command_dup(cmd)); cmd->pending = 1; - return; + goto out; } /* Send the KILL command to the server */ idp = silc_id_payload_encode(target->id, SILC_ID_CLIENT); if (cmd->argc == 2) - buffer = silc_command_payload_encode_va(SILC_COMMAND_KILL, 0, 1, + buffer = silc_command_payload_encode_va(SILC_COMMAND_KILL, + ++conn->cmd_ident, 1, 1, idp->data, idp->len); else - buffer = silc_command_payload_encode_va(SILC_COMMAND_KILL, 0, 2, + buffer = silc_command_payload_encode_va(SILC_COMMAND_KILL, + ++conn->cmd_ident, 2, 1, idp->data, idp->len, 2, cmd->argv[2], strlen(cmd->argv[2])); @@ -698,26 +833,14 @@ SILC_CLIENT_CMD_FUNC(kill) /* Notify application */ COMMAND; - /* Remove the client entry to be killed */ - silc_idcache_del_by_id(conn->client_cache, SILC_ID_CLIENT, - target->id); - if (target->nickname) - silc_free(target->nickname); - if (target->server) - silc_free(target->server); - if (target->id) - silc_free(target->id); - if (target->send_key) - silc_cipher_free(target->send_key); - if (target->receive_key) - silc_cipher_free(target->receive_key); - silc_free(target); + /* Register a pending callback that will actually remove the killed + client from our cache. */ + silc_client_command_pending(conn, SILC_COMMAND_KILL, conn->cmd_ident, + silc_client_command_kill_remove, + silc_client_command_dup(cmd)); out: - if (nickname) - silc_free(nickname); - if (server) - silc_free(server); + silc_free(nickname); silc_client_command_free(cmd); } @@ -729,7 +852,7 @@ SILC_CLIENT_CMD_FUNC(info) SilcClientCommandContext cmd = (SilcClientCommandContext)context; SilcClientConnection conn = cmd->conn; SilcBuffer buffer; - char *name; + char *name = NULL; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -737,17 +860,21 @@ SILC_CLIENT_CMD_FUNC(info) goto out; } - if (cmd->argc < 2) - name = strdup(conn->remote_host); - else + if (cmd->argc == 2) name = strdup(cmd->argv[1]); /* Send the command */ - buffer = silc_command_payload_encode_va(SILC_COMMAND_INFO, 0, 1, - 1, name, strlen(name)); + if (name) + buffer = silc_command_payload_encode_va(SILC_COMMAND_INFO, 0, 1, + 1, name, strlen(name)); + else + buffer = silc_command_payload_encode(SILC_COMMAND_INFO, 0, + NULL, NULL, NULL, 0); silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); + if (name) + silc_free(name); /* Notify application */ COMMAND; @@ -766,7 +893,6 @@ SILC_CLIENT_CMD_FUNC(ping) SilcBuffer buffer; void *id; int i; - char *name = NULL; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -774,13 +900,11 @@ SILC_CLIENT_CMD_FUNC(ping) goto out; } - if (cmd->argc == 1 || !strcmp(cmd->argv[1], conn->remote_host)) - name = strdup(conn->remote_host); - /* Send the command */ buffer = silc_command_payload_encode_va(SILC_COMMAND_PING, 0, 1, 1, conn->remote_id_data, - SILC_ID_SERVER_LEN); + silc_id_get_len(conn->remote_id, + SILC_ID_SERVER)); silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); @@ -798,8 +922,7 @@ SILC_CLIENT_CMD_FUNC(ping) if (conn->ping[i].dest_id == NULL) { conn->ping[i].start_time = time(NULL); conn->ping[i].dest_id = id; - conn->ping[i].dest_name = name; - conn->ping_count++; + conn->ping[i].dest_name = strdup(conn->remote_host); break; } } @@ -808,7 +931,7 @@ SILC_CLIENT_CMD_FUNC(ping) conn->ping = silc_realloc(conn->ping, sizeof(*conn->ping) * (i + 1)); conn->ping[i].start_time = time(NULL); conn->ping[i].dest_id = id; - conn->ping[i].dest_name = name; + conn->ping[i].dest_name = strdup(conn->remote_host); conn->ping_count++; } @@ -819,18 +942,16 @@ SILC_CLIENT_CMD_FUNC(ping) silc_client_command_free(cmd); } -SILC_CLIENT_CMD_FUNC(notice) -{ -} - /* Command JOIN. Joins to a channel. */ SILC_CLIENT_CMD_FUNC(join) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; SilcClientConnection conn = cmd->conn; - SilcIDCacheEntry id_cache = NULL; - SilcBuffer buffer, idp; + SilcChannelEntry channel; + SilcBuffer buffer, idp, auth = NULL; + char *name, *passphrase = NULL, *cipher = NULL, *hmac = NULL; + int i; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -839,51 +960,64 @@ SILC_CLIENT_CMD_FUNC(join) } if (cmd->argc < 2) { - /* Show channels currently joined to */ - + COMMAND_ERROR; goto out; } - + /* See if we have joined to the requested channel already */ - if (silc_idcache_find_by_data_one(conn->channel_cache, cmd->argv[1], - &id_cache)) { - cmd->client->ops->say(cmd->client, conn, - "You are talking to channel %s", cmd->argv[1]); - conn->current_channel = (SilcChannelEntry)id_cache->context; -#if 0 - cmd->client->screen->bottom_line->channel = cmd->argv[1]; - silc_screen_print_bottom_line(cmd->client->screen, 0); -#endif + channel = silc_client_get_channel(cmd->client, conn, cmd->argv[1]); + if (channel && silc_client_on_channel(channel, conn->local_entry)) goto out; - } idp = silc_id_payload_encode(conn->local_id, SILC_ID_CLIENT); - /* Send JOIN command to the server */ - if (cmd->argc == 2) - buffer = - silc_command_payload_encode_va(SILC_COMMAND_JOIN, 0, 2, - 1, cmd->argv[1], cmd->argv_lens[1], - 2, idp->data, idp->len); - else if (cmd->argc == 3) - /* XXX Buggy */ - buffer = - silc_command_payload_encode_va(SILC_COMMAND_JOIN, 0, 3, - 1, cmd->argv[1], cmd->argv_lens[1], - 2, idp->data, idp->len, - 3, cmd->argv[2], cmd->argv_lens[2]); - else - buffer = - silc_command_payload_encode_va(SILC_COMMAND_JOIN, 0, 4, - 1, cmd->argv[1], cmd->argv_lens[1], - 2, idp->data, idp->len, - 3, cmd->argv[2], cmd->argv_lens[2], - 4, cmd->argv[3], cmd->argv_lens[3]); + if (cmd->argv_lens[1] > 256) + cmd->argv_lens[1] = 256; + + name = cmd->argv[1]; + + for (i = 2; i < cmd->argc; i++) { + if (!strcasecmp(cmd->argv[i], "-cipher") && cmd->argc > i + 1) { + cipher = cmd->argv[i + 1]; + i++; + } else if (!strcasecmp(cmd->argv[i], "-hmac") && cmd->argc > i + 1) { + hmac = cmd->argv[i + 1]; + i++; + } else if (!strcasecmp(cmd->argv[i], "-founder") && cmd->argc > i + 1) { + if (!strcasecmp(cmd->argv[i + 1], "-pubkey")) { + auth = silc_auth_public_key_auth_generate(cmd->client->public_key, + cmd->client->private_key, + conn->hash, + conn->local_id, + SILC_ID_CLIENT); + } else { + auth = silc_auth_payload_encode(SILC_AUTH_PASSWORD, NULL, 0, + cmd->argv[i + 1], + cmd->argv_lens[i + 1]); + } + i++; + } else { + passphrase = cmd->argv[i]; + } + } + /* Send JOIN command to the server */ + buffer = + silc_command_payload_encode_va(SILC_COMMAND_JOIN, 0, 6, + 1, name, strlen(name), + 2, idp->data, idp->len, + 3, passphrase, + passphrase ? strlen(passphrase) : 0, + 4, cipher, cipher ? strlen(cipher) : 0, + 5, hmac, hmac ? strlen(hmac) : 0, + 6, auth ? auth->data : NULL, + auth ? auth->len : 0); silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); silc_buffer_free(idp); + if (auth) + silc_buffer_free(auth); /* Notify application */ COMMAND; @@ -906,17 +1040,22 @@ SILC_CLIENT_CMD_FUNC(motd) goto out; } - if (cmd->argc < 1 || cmd->argc > 1) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /MOTD"); + if (cmd->argc < 1 || cmd->argc > 2) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /MOTD []"); COMMAND_ERROR; goto out; } /* Send TOPIC command to the server */ - buffer = silc_command_payload_encode_va(SILC_COMMAND_MOTD, 0, 1, - 2, conn->remote_host, - strlen(conn->remote_host)); + if (cmd->argc == 1) + buffer = silc_command_payload_encode_va(SILC_COMMAND_MOTD, 0, 1, + 1, conn->remote_host, + strlen(conn->remote_host)); + else + buffer = silc_command_payload_encode_va(SILC_COMMAND_MOTD, 0, 1, + 1, cmd->argv[1], + cmd->argv_lens[1]); silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); @@ -928,25 +1067,16 @@ SILC_CLIENT_CMD_FUNC(motd) silc_client_command_free(cmd); } -/* UMODE. Set user mode in SILC. */ +/* UMODE. Set/unset user mode in SILC. This is used mainly to unset the + modes as client cannot set itself server/router operator privileges. */ SILC_CLIENT_CMD_FUNC(umode) -{ - -} - -/* CMODE command. Sets channel mode. Modes that does not require any arguments - can be set several at once. Those modes that require argument must be set - separately (unless set with modes that does not require arguments). */ - -SILC_CLIENT_CMD_FUNC(cmode) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; SilcClientConnection conn = cmd->conn; - SilcChannelEntry channel; - SilcBuffer buffer, chidp; - unsigned char *name, *cp, modebuf[4], tmp[4], *arg = NULL; - unsigned int mode, add, type, len, arg_len = 0; + SilcBuffer buffer, idp; + unsigned char *cp, modebuf[4]; + SilcUInt32 mode, add, len; int i; if (!cmd->conn) { @@ -955,52 +1085,149 @@ SILC_CLIENT_CMD_FUNC(cmode) goto out; } - if (cmd->argc < 3) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /CMODE +|- [{ }]"); + if (cmd->argc < 2) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /UMODE +|-"); COMMAND_ERROR; goto out; } - if (cmd->argv[1][0] == '*') { - if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on any channel"); - COMMAND_ERROR; - goto out; - } - - channel = conn->current_channel; - } else { - name = cmd->argv[1]; - - channel = silc_client_get_channel(cmd->client, conn, name); - if (!channel) { - cmd->client->ops->say(cmd->client, conn, "You are on that channel"); - COMMAND_ERROR; - goto out; - } - } - - mode = channel->mode; + mode = conn->local_entry->mode; /* Are we adding or removing mode */ - if (cmd->argv[2][0] == '-') + if (cmd->argv[1][0] == '-') add = FALSE; else add = TRUE; - /* Argument type to be sent to server */ - type = 0; - /* Parse mode */ - cp = cmd->argv[2] + 1; + cp = cmd->argv[1] + 1; len = strlen(cp); for (i = 0; i < len; i++) { switch(cp[i]) { - case 'p': - if (add) - mode |= SILC_CHANNEL_MODE_PRIVATE; - else + case 'a': + if (add) { + mode = 0; + mode |= SILC_UMODE_SERVER_OPERATOR; + mode |= SILC_UMODE_ROUTER_OPERATOR; + } else { + mode = SILC_UMODE_NONE; + } + break; + case 's': + if (add) + mode |= SILC_UMODE_SERVER_OPERATOR; + else + mode &= ~SILC_UMODE_SERVER_OPERATOR; + break; + case 'r': + if (add) + mode |= SILC_UMODE_ROUTER_OPERATOR; + else + mode &= ~SILC_UMODE_ROUTER_OPERATOR; + break; + case 'g': + if (add) + mode |= SILC_UMODE_GONE; + else + mode &= ~SILC_UMODE_GONE; + break; + default: + COMMAND_ERROR; + goto out; + break; + } + } + + idp = silc_id_payload_encode(conn->local_id, SILC_ID_CLIENT); + SILC_PUT32_MSB(mode, modebuf); + + /* Send the command packet. We support sending only one mode at once + that requires an argument. */ + buffer = + silc_command_payload_encode_va(SILC_COMMAND_UMODE, ++conn->cmd_ident, 2, + 1, idp->data, idp->len, + 2, modebuf, sizeof(modebuf)); + silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, + 0, NULL, NULL, buffer->data, buffer->len, TRUE); + silc_buffer_free(buffer); + silc_buffer_free(idp); + + /* Notify application */ + COMMAND; + + out: + silc_client_command_free(cmd); +} + +/* CMODE command. Sets channel mode. Modes that does not require any arguments + can be set several at once. Those modes that require argument must be set + separately (unless set with modes that does not require arguments). */ + +SILC_CLIENT_CMD_FUNC(cmode) +{ + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClientConnection conn = cmd->conn; + SilcChannelEntry channel; + SilcBuffer buffer, chidp, auth = NULL; + unsigned char *name, *cp, modebuf[4], tmp[4], *arg = NULL; + SilcUInt32 mode, add, type, len, arg_len = 0; + int i; + + if (!cmd->conn) { + SILC_NOT_CONNECTED(cmd->client, cmd->conn); + COMMAND_ERROR; + goto out; + } + + if (cmd->argc < 3) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CMODE +|- [{ }]"); + COMMAND_ERROR; + goto out; + } + + if (cmd->argv[1][0] == '*') { + if (!conn->current_channel) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on any channel"); + COMMAND_ERROR; + goto out; + } + + channel = conn->current_channel; + } else { + name = cmd->argv[1]; + + channel = silc_client_get_channel(cmd->client, conn, name); + if (!channel) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are on that channel"); + COMMAND_ERROR; + goto out; + } + } + + mode = channel->mode; + + /* Are we adding or removing mode */ + if (cmd->argv[2][0] == '-') + add = FALSE; + else + add = TRUE; + + /* Argument type to be sent to server */ + type = 0; + + /* Parse mode */ + cp = cmd->argv[2] + 1; + len = strlen(cp); + for (i = 0; i < len; i++) { + switch(cp[i]) { + case 'p': + if (add) + mode |= SILC_CHANNEL_MODE_PRIVATE; + else mode &= ~SILC_CHANNEL_MODE_PRIVATE; break; case 's': @@ -1032,6 +1259,12 @@ SILC_CLIENT_CMD_FUNC(cmode) int ll; mode |= SILC_CHANNEL_MODE_ULIMIT; type = 3; + if (cmd->argc < 4) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CMODE +|- [{ }]"); + COMMAND_ERROR; + goto out; + } ll = atoi(cmd->argv[3]); SILC_PUT32_MSB(ll, tmp); arg = tmp; @@ -1044,40 +1277,77 @@ SILC_CLIENT_CMD_FUNC(cmode) if (add) { mode |= SILC_CHANNEL_MODE_PASSPHRASE; type = 4; + if (cmd->argc < 4) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CMODE +|- [{ }]"); + COMMAND_ERROR; + goto out; + } arg = cmd->argv[3]; arg_len = cmd->argv_lens[3]; } else { mode &= ~SILC_CHANNEL_MODE_PASSPHRASE; } break; - case 'b': + case 'c': if (add) { - mode |= SILC_CHANNEL_MODE_BAN; + mode |= SILC_CHANNEL_MODE_CIPHER; type = 5; + if (cmd->argc < 4) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CMODE +|- [{ }]"); + COMMAND_ERROR; + goto out; + } arg = cmd->argv[3]; arg_len = cmd->argv_lens[3]; } else { - mode &= ~SILC_CHANNEL_MODE_BAN; + mode &= ~SILC_CHANNEL_MODE_CIPHER; } break; - case 'I': + case 'h': if (add) { - mode |= SILC_CHANNEL_MODE_INVITE_LIST; + mode |= SILC_CHANNEL_MODE_HMAC; type = 6; + if (cmd->argc < 4) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CMODE +|- [{ }]"); + COMMAND_ERROR; + goto out; + } arg = cmd->argv[3]; arg_len = cmd->argv_lens[3]; } else { - mode &= ~SILC_CHANNEL_MODE_INVITE_LIST; + mode &= ~SILC_CHANNEL_MODE_HMAC; } break; - case 'c': + case 'f': if (add) { - mode |= SILC_CHANNEL_MODE_CIPHER; - type = 8; - arg = cmd->argv[3]; - arg_len = cmd->argv_lens[3]; + mode |= SILC_CHANNEL_MODE_FOUNDER_AUTH; + type = 7; + + if (cmd->argc < 4) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CMODE +|- [{ }]"); + COMMAND_ERROR; + goto out; + } + + if (!strcasecmp(cmd->argv[3], "-pubkey")) { + auth = silc_auth_public_key_auth_generate(cmd->client->public_key, + cmd->client->private_key, + conn->hash, + conn->local_id, + SILC_ID_CLIENT); + } else { + auth = silc_auth_payload_encode(SILC_AUTH_PASSWORD, NULL, 0, + cmd->argv[3], cmd->argv_lens[3]); + } + + arg = auth->data; + arg_len = auth->len; } else { - mode &= ~SILC_CHANNEL_MODE_CIPHER; + mode &= ~SILC_CHANNEL_MODE_FOUNDER_AUTH; } break; default: @@ -1087,11 +1357,6 @@ SILC_CLIENT_CMD_FUNC(cmode) } } - if (type && cmd->argc < 3) { - COMMAND_ERROR; - goto out; - } - chidp = silc_id_payload_encode(channel->id, SILC_ID_CHANNEL); SILC_PUT32_MSB(mode, modebuf); @@ -1114,6 +1379,8 @@ SILC_CLIENT_CMD_FUNC(cmode) 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); silc_buffer_free(chidp); + if (auth) + silc_buffer_free(auth); /* Notify application */ COMMAND; @@ -1127,15 +1394,15 @@ SILC_CLIENT_CMD_FUNC(cmode) SILC_CLIENT_CMD_FUNC(cumode) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClient client = cmd->client; SilcClientConnection conn = cmd->conn; SilcChannelEntry channel; SilcChannelUser chu; SilcClientEntry client_entry; - SilcBuffer buffer, clidp, chidp; + SilcBuffer buffer, clidp, chidp, auth = NULL; unsigned char *name, *cp, modebuf[4]; - unsigned int mode = 0, add, len; - char *nickname = NULL, *server = NULL; - unsigned int num = 0; + SilcUInt32 mode = 0, add, len; + char *nickname = NULL; int i; if (!cmd->conn) { @@ -1145,15 +1412,16 @@ SILC_CLIENT_CMD_FUNC(cumode) } if (cmd->argc < 4) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /CUMODE +|- [@]"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CUMODE +|- [@]"); COMMAND_ERROR; goto out; } if (cmd->argv[1][0] == '*') { if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on any channel"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on any channel"); COMMAND_ERROR; goto out; } @@ -1164,40 +1432,42 @@ SILC_CLIENT_CMD_FUNC(cumode) channel = silc_client_get_channel(cmd->client, conn, name); if (!channel) { - cmd->client->ops->say(cmd->client, conn, "You are on that channel"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are on that channel"); COMMAND_ERROR; goto out; } } /* Parse the typed nickname. */ - if (!silc_parse_nickname(cmd->argv[3], &nickname, &server, &num)) { - cmd->client->ops->say(cmd->client, conn, "Bad nickname"); - COMMAND_ERROR; - goto out; - } + if (client->internal->params->nickname_parse) + client->internal->params->nickname_parse(cmd->argv[3], &nickname); + else + nickname = strdup(cmd->argv[3]); /* Find client entry */ - client_entry = silc_idlist_get_client(cmd->client, conn, - nickname, server, num, TRUE); + client_entry = silc_idlist_get_client(cmd->client, conn, nickname, + cmd->argv[3], TRUE); if (!client_entry) { + if (cmd->pending) { + COMMAND_ERROR; + goto out; + } + /* Client entry not found, it was requested thus mark this to be pending command. */ silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident, - silc_client_command_destructor, silc_client_command_cumode, silc_client_command_dup(cmd)); cmd->pending = 1; - return; + goto out; } - while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) { - if (chu->client == client_entry) { - chu->mode = mode; - break; - } - } + /* Get the current mode */ + chu = silc_client_on_channel(channel, client_entry); + if (chu) + mode = chu->mode; /* Are we adding or removing mode */ if (cmd->argv[2][0] == '-') @@ -1219,10 +1489,23 @@ SILC_CLIENT_CMD_FUNC(cumode) } break; case 'f': - if (add) + if (add) { + if (cmd->argc == 5) { + if (!strcasecmp(cmd->argv[4], "-pubkey")) { + auth = silc_auth_public_key_auth_generate(cmd->client->public_key, + cmd->client->private_key, + conn->hash, + conn->local_id, + SILC_ID_CLIENT); + } else { + auth = silc_auth_payload_encode(SILC_AUTH_PASSWORD, NULL, 0, + cmd->argv[4], cmd->argv_lens[4]); + } + } mode |= SILC_CHANNEL_UMODE_CHANFO; - else + } else { mode &= ~SILC_CHANNEL_UMODE_CHANFO; + } break; case 'o': if (add) @@ -1243,25 +1526,27 @@ SILC_CLIENT_CMD_FUNC(cumode) /* Send the command packet. We support sending only one mode at once that requires an argument. */ - buffer = silc_command_payload_encode_va(SILC_COMMAND_CUMODE, 0, 3, + buffer = silc_command_payload_encode_va(SILC_COMMAND_CUMODE, 0, + auth ? 4 : 3, 1, chidp->data, chidp->len, 2, modebuf, 4, - 3, clidp->data, clidp->len); - + 3, clidp->data, clidp->len, + 4, auth ? auth->data : NULL, + auth ? auth->len : 0); + silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, 0, NULL, NULL, buffer->data, buffer->len, TRUE); silc_buffer_free(buffer); silc_buffer_free(chidp); silc_buffer_free(clidp); + if (auth) + silc_buffer_free(auth); /* Notify application */ COMMAND; out: - if (nickname) - silc_free(nickname); - if (server) - silc_free(server); + silc_free(nickname); silc_client_command_free(cmd); } @@ -1270,14 +1555,14 @@ SILC_CLIENT_CMD_FUNC(cumode) SILC_CLIENT_CMD_FUNC(kick) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClient client = cmd->client; SilcClientConnection conn = cmd->conn; SilcIDCacheEntry id_cache = NULL; SilcChannelEntry channel; SilcBuffer buffer, idp, idp2; SilcClientEntry target; char *name; - unsigned int num = 0; - char *nickname = NULL, *server = NULL; + char *nickname = NULL; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -1286,15 +1571,16 @@ SILC_CLIENT_CMD_FUNC(kick) } if (cmd->argc < 3) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /KICK []"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /KICK []"); COMMAND_ERROR; goto out; } if (cmd->argv[1][0] == '*') { if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on any channel"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on any channel"); COMMAND_ERROR; goto out; } @@ -1304,14 +1590,16 @@ SILC_CLIENT_CMD_FUNC(kick) } if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on that channel"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on that channel"); COMMAND_ERROR; goto out; } /* Get the Channel ID of the channel */ - if (!silc_idcache_find_by_data_one(conn->channel_cache, name, &id_cache)) { - cmd->client->ops->say(cmd->client, conn, "You are not on that channel"); + if (!silc_idcache_find_by_name_one(conn->channel_cache, name, &id_cache)) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on that channel"); COMMAND_ERROR; goto out; } @@ -1319,18 +1607,17 @@ SILC_CLIENT_CMD_FUNC(kick) channel = (SilcChannelEntry)id_cache->context; /* Parse the typed nickname. */ - if (!silc_parse_nickname(cmd->argv[2], &nickname, &server, &num)) { - cmd->client->ops->say(cmd->client, conn, "Bad nickname"); - COMMAND_ERROR; - goto out; - } + if (client->internal->params->nickname_parse) + client->internal->params->nickname_parse(cmd->argv[2], &nickname); + else + nickname = strdup(cmd->argv[2]); /* Get the target client */ target = silc_idlist_get_client(cmd->client, conn, nickname, - server, num, FALSE); + cmd->argv[2], FALSE); if (!target) { - cmd->client->ops->say(cmd->client, conn, "No such client: %s", - cmd->argv[2]); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "No such client: %s", cmd->argv[2]); COMMAND_ERROR; goto out; } @@ -1358,22 +1645,50 @@ SILC_CLIENT_CMD_FUNC(kick) COMMAND; out: - if (nickname) - silc_free(nickname); - if (server) - silc_free(server); + silc_free(nickname); silc_client_command_free(cmd); } +static void silc_client_command_oper_send(unsigned char *data, + SilcUInt32 data_len, void *context) +{ + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClientConnection conn = cmd->conn; + SilcBuffer buffer, auth; + + if (cmd->argc >= 3) { + /* Encode the public key authentication payload */ + auth = silc_auth_public_key_auth_generate(cmd->client->public_key, + cmd->client->private_key, + conn->hash, + conn->local_id, + SILC_ID_CLIENT); + } else { + /* Encode the password authentication payload */ + auth = silc_auth_payload_encode(SILC_AUTH_PASSWORD, NULL, 0, + data, data_len); + } + + buffer = silc_command_payload_encode_va(SILC_COMMAND_OPER, 0, 2, + 1, cmd->argv[1], + strlen(cmd->argv[1]), + 2, auth->data, auth->len); + silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, + 0, NULL, NULL, buffer->data, buffer->len, TRUE); + + silc_buffer_free(buffer); + silc_buffer_free(auth); + + /* Notify application */ + COMMAND; +} + /* OPER command. Used to obtain server operator privileges. */ SILC_CLIENT_CMD_FUNC(oper) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; SilcClientConnection conn = cmd->conn; - SilcBuffer buffer; - unsigned char *auth_data; - SilcBuffer auth; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -1382,32 +1697,47 @@ SILC_CLIENT_CMD_FUNC(oper) } if (cmd->argc < 2) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /OPER []"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /OPER [-pubkey]"); COMMAND_ERROR; goto out; } - if (cmd->argc == 3) { - /* XXX Get public key */ - auth_data = NULL; - COMMAND_ERROR; - goto out; - } else { + if (cmd->argc < 3) { /* Get passphrase */ + cmd->client->internal->ops->ask_passphrase(cmd->client, conn, + silc_client_command_oper_send, + context); + return; + } - auth_data = cmd->client->ops->ask_passphrase(cmd->client, conn); - if (!auth_data) { - COMMAND_ERROR; - goto out; - } + silc_client_command_oper_send(NULL, 0, context); - /* Encode the authentication payload */ + out: + silc_client_command_free(cmd); +} + +static void silc_client_command_silcoper_send(unsigned char *data, + SilcUInt32 data_len, void *context) +{ + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClientConnection conn = cmd->conn; + SilcBuffer buffer, auth; + + if (cmd->argc >= 3) { + /* Encode the public key authentication payload */ + auth = silc_auth_public_key_auth_generate(cmd->client->public_key, + cmd->client->private_key, + conn->hash, + conn->local_id, + SILC_ID_CLIENT); + } else { + /* Encode the password authentication payload */ auth = silc_auth_payload_encode(SILC_AUTH_PASSWORD, NULL, 0, - auth_data, strlen(auth_data)); + data, data_len); } - buffer = silc_command_payload_encode_va(SILC_COMMAND_OPER, 0, 2, + buffer = silc_command_payload_encode_va(SILC_COMMAND_SILCOPER, 0, 2, 1, cmd->argv[1], strlen(cmd->argv[1]), 2, auth->data, auth->len); @@ -1416,14 +1746,9 @@ SILC_CLIENT_CMD_FUNC(oper) silc_buffer_free(buffer); silc_buffer_free(auth); - memset(auth_data, 0, strlen(auth_data)); - silc_free(auth_data); /* Notify application */ COMMAND; - - out: - silc_client_command_free(cmd); } /* SILCOPER command. Used to obtain router operator privileges. */ @@ -1432,9 +1757,6 @@ SILC_CLIENT_CMD_FUNC(silcoper) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; SilcClientConnection conn = cmd->conn; - SilcBuffer buffer; - unsigned char *auth_data; - SilcBuffer auth; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -1443,45 +1765,21 @@ SILC_CLIENT_CMD_FUNC(silcoper) } if (cmd->argc < 2) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /SILCOPER []"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /SILCOPER [-pubkey]"); COMMAND_ERROR; goto out; } - if (cmd->argc == 3) { - /* XXX Get public key */ - auth_data = NULL; - COMMAND_ERROR; - goto out; - } else { + if (cmd->argc < 3) { /* Get passphrase */ - - auth_data = cmd->client->ops->ask_passphrase(cmd->client, conn); - if (!auth_data) { - COMMAND_ERROR; - goto out; - } - - /* Encode the authentication payload */ - auth = silc_auth_payload_encode(SILC_AUTH_PASSWORD, NULL, 0, - auth_data, strlen(auth_data)); + cmd->client->internal->ops->ask_passphrase(cmd->client, conn, + silc_client_command_silcoper_send, + context); + return; } - buffer = silc_command_payload_encode_va(SILC_COMMAND_SILCOPER, 0, 2, - 1, cmd->argv[1], - strlen(cmd->argv[1]), - 2, auth->data, auth->len); - silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, - 0, NULL, NULL, buffer->data, buffer->len, TRUE); - - silc_buffer_free(buffer); - silc_buffer_free(auth); - memset(auth_data, 0, strlen(auth_data)); - silc_free(auth_data); - - /* Notify application */ - COMMAND; + silc_client_command_silcoper_send(NULL, 0, context); out: silc_client_command_free(cmd); @@ -1495,7 +1793,7 @@ SILC_CLIENT_CMD_FUNC(connect) SilcClientConnection conn = cmd->conn; SilcBuffer buffer; unsigned char port[4]; - unsigned int tmp; + SilcUInt32 tmp; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -1504,8 +1802,8 @@ SILC_CLIENT_CMD_FUNC(connect) } if (cmd->argc < 2) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /CONNECT []"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CONNECT []"); COMMAND_ERROR; goto out; } @@ -1535,8 +1833,83 @@ SILC_CLIENT_CMD_FUNC(connect) silc_client_command_free(cmd); } -SILC_CLIENT_CMD_FUNC(restart) +/* Command BAN. This is used to manage the ban list of the channel. */ + +SILC_CLIENT_CMD_FUNC(ban) { + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClientConnection conn = cmd->conn; + SilcChannelEntry channel; + SilcBuffer buffer, chidp; + int type = 0; + char *name, *ban = NULL; + + if (!cmd->conn) { + SILC_NOT_CONNECTED(cmd->client, cmd->conn); + COMMAND_ERROR; + goto out; + } + + if (cmd->argc < 2) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /BAN " + "[+|-[[@[![@hostname>]]]]]"); + COMMAND_ERROR; + goto out; + } + + if (cmd->argv[1][0] == '*') { + if (!conn->current_channel) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on any channel"); + COMMAND_ERROR; + goto out; + } + + channel = conn->current_channel; + } else { + name = cmd->argv[1]; + + channel = silc_client_get_channel(cmd->client, conn, name); + if (!channel) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are on that channel"); + COMMAND_ERROR; + goto out; + } + } + + if (cmd->argc == 3) { + if (cmd->argv[2][0] == '+') + type = 2; + else + type = 3; + + ban = cmd->argv[2]; + ban++; + } + + chidp = silc_id_payload_encode(channel->id, SILC_ID_CHANNEL); + + /* Send the command */ + if (ban) + buffer = silc_command_payload_encode_va(SILC_COMMAND_BAN, 0, 2, + 1, chidp->data, chidp->len, + type, ban, strlen(ban)); + else + buffer = silc_command_payload_encode_va(SILC_COMMAND_BAN, 0, 1, + 1, chidp->data, chidp->len); + + silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, + 0, NULL, NULL, buffer->data, buffer->len, TRUE); + silc_buffer_free(buffer); + silc_buffer_free(chidp); + + /* Notify application */ + COMMAND; + + out: + silc_client_command_free(cmd); } /* CLOSE command. Close server connection to the remote server */ @@ -1547,7 +1920,7 @@ SILC_CLIENT_CMD_FUNC(close) SilcClientConnection conn = cmd->conn; SilcBuffer buffer; unsigned char port[4]; - unsigned int tmp; + SilcUInt32 tmp; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -1556,8 +1929,8 @@ SILC_CLIENT_CMD_FUNC(close) } if (cmd->argc < 2) { - cmd->client->ops->say(cmd->client, conn, - "Usage: /CLOSE []"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /CLOSE []"); COMMAND_ERROR; goto out; } @@ -1600,7 +1973,7 @@ SILC_CLIENT_CMD_FUNC(shutdown) } /* Send the command */ - silc_client_send_command(cmd->client, cmd->conn, + silc_client_command_send(cmd->client, cmd->conn, SILC_COMMAND_SHUTDOWN, 0, 0); /* Notify application */ @@ -1609,15 +1982,15 @@ SILC_CLIENT_CMD_FUNC(shutdown) out: silc_client_command_free(cmd); } - + /* LEAVE command. Leaves a channel. Client removes itself from a channel. */ SILC_CLIENT_CMD_FUNC(leave) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; SilcClientConnection conn = cmd->conn; - SilcIDCacheEntry id_cache = NULL; SilcChannelEntry channel; + SilcChannelUser chu; SilcBuffer buffer, idp; char *name; @@ -1628,14 +2001,16 @@ SILC_CLIENT_CMD_FUNC(leave) } if (cmd->argc != 2) { - cmd->client->ops->say(cmd->client, conn, "Usage: /LEAVE "); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /LEAVE "); COMMAND_ERROR; goto out; } if (cmd->argv[1][0] == '*') { if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on any channel"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on any channel"); COMMAND_ERROR; goto out; } @@ -1644,23 +2019,25 @@ SILC_CLIENT_CMD_FUNC(leave) name = cmd->argv[1]; } - if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on that channel"); + /* Get the channel entry */ + channel = silc_client_get_channel(cmd->client, conn, name); + if (!channel) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on that channel"); COMMAND_ERROR; goto out; } - /* Get the Channel ID of the channel */ - if (!silc_idcache_find_by_data_one(conn->channel_cache, name, &id_cache)) { - cmd->client->ops->say(cmd->client, conn, "You are not on that channel"); - COMMAND_ERROR; - goto out; + /* Remove us from 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); } - channel = (SilcChannelEntry)id_cache->context; - /* Send LEAVE command to the server */ - idp = silc_id_payload_encode(id_cache->id, SILC_ID_CHANNEL); + idp = silc_id_payload_encode(channel->id, SILC_ID_CHANNEL); buffer = silc_command_payload_encode_va(SILC_COMMAND_LEAVE, 0, 1, 1, idp->data, idp->len); silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, @@ -1668,21 +2045,14 @@ SILC_CLIENT_CMD_FUNC(leave) silc_buffer_free(buffer); silc_buffer_free(idp); - /* We won't talk anymore on this channel */ - cmd->client->ops->say(cmd->client, conn, "You have left channel %s", name); - - conn->current_channel = NULL; - - silc_idcache_del_by_id(conn->channel_cache, SILC_ID_CHANNEL, channel->id); - silc_free(channel->channel_name); - silc_free(channel->id); - silc_free(channel->key); - silc_cipher_free(channel->channel_key); - silc_free(channel); - /* Notify application */ COMMAND; + if (conn->current_channel == channel) + conn->current_channel = NULL; + + silc_client_del_channel(cmd->client, cmd->conn, channel); + out: silc_client_command_free(cmd); } @@ -1694,11 +2064,8 @@ SILC_CLIENT_CMD_FUNC(users) { SilcClientCommandContext cmd = (SilcClientCommandContext)context; SilcClientConnection conn = cmd->conn; - SilcIDCacheEntry id_cache = NULL; - SilcChannelEntry channel; - SilcBuffer buffer, idp; - char *name, *line = NULL; - unsigned int line_len = 0; + SilcBuffer buffer; + char *name; if (!cmd->conn) { SILC_NOT_CONNECTED(cmd->client, cmd->conn); @@ -1707,14 +2074,16 @@ SILC_CLIENT_CMD_FUNC(users) } if (cmd->argc != 2) { - cmd->client->ops->say(cmd->client, conn, "Usage: /USERS "); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /USERS "); COMMAND_ERROR; goto out; } if (cmd->argv[1][0] == '*') { if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on any channel"); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO, + "You are not on any channel"); COMMAND_ERROR; goto out; } @@ -1723,113 +2092,262 @@ SILC_CLIENT_CMD_FUNC(users) name = cmd->argv[1]; } - if (!conn->current_channel) { - cmd->client->ops->say(cmd->client, conn, "You are not on that channel"); + /* Send USERS command to the server */ + buffer = silc_command_payload_encode_va(SILC_COMMAND_USERS, + ++conn->cmd_ident, 1, + 2, name, strlen(name)); + silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, + NULL, 0, NULL, NULL, buffer->data, + buffer->len, TRUE); + silc_buffer_free(buffer); + + /* Notify application */ + COMMAND; + + out: + silc_client_command_free(cmd); +} + +/* Command GETKEY. Used to fetch remote client's public key. */ + +SILC_CLIENT_CMD_FUNC(getkey) +{ + SilcClientCommandContext cmd = (SilcClientCommandContext)context; + SilcClientConnection conn = cmd->conn; + SilcClient client = cmd->client; + SilcClientEntry client_entry = NULL; + SilcServerEntry server_entry = NULL; + char *nickname = NULL; + SilcBuffer idp, buffer; + + SILC_LOG_DEBUG(("Start")); + + if (!cmd->conn) { + SILC_NOT_CONNECTED(cmd->client, cmd->conn); COMMAND_ERROR; goto out; } - /* Get the Channel ID of the channel */ - if (!silc_idcache_find_by_data_one(conn->channel_cache, name, &id_cache)) { - /* XXX should resolve the channel ID; LIST command */ - cmd->client->ops->say(cmd->client, conn, - "You are not on that channel", name); + if (cmd->argc < 2) { + client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_INFO, + "Usage: /GETKEY "); COMMAND_ERROR; goto out; } - channel = (SilcChannelEntry)id_cache->context; + /* Parse the typed nickname. */ + if (client->internal->params->nickname_parse) + client->internal->params->nickname_parse(cmd->argv[1], &nickname); + else + nickname = strdup(cmd->argv[1]); - if (!cmd->pending) { - /* Send USERS command to the server */ - idp = silc_id_payload_encode(id_cache->id, SILC_ID_CHANNEL); - buffer = silc_command_payload_encode_va(SILC_COMMAND_USERS, - ++conn->cmd_ident, 1, - 1, idp->data, idp->len); - silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, - NULL, 0, NULL, NULL, buffer->data, - buffer->len, TRUE); - silc_buffer_free(buffer); - silc_buffer_free(idp); + /* Find client entry */ + client_entry = silc_idlist_get_client(client, conn, nickname, cmd->argv[1], + FALSE); + if (!client_entry) { + /* Check whether user requested server actually */ + server_entry = silc_client_get_server(client, conn, cmd->argv[1]); + + if (!server_entry) { + /* No. what ever user wants we don't have it, so resolve it. We + will first try to resolve the client, and if that fails then + we'll try to resolve the server. */ + + if (!cmd->pending) { + /* This will send the IDENTIFY command for nickname */ + silc_idlist_get_client(client, conn, nickname, cmd->argv[1], TRUE); + silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, + conn->cmd_ident, + silc_client_command_getkey, + silc_client_command_dup(cmd)); + cmd->pending = 1; + goto out; + } else { + SilcClientCommandReplyContext reply = + (SilcClientCommandReplyContext)context2; + SilcCommandStatus status; + unsigned char *tmp = silc_argument_get_arg_type(reply->args, 1, NULL); + SILC_GET16_MSB(status, tmp); + + /* If nickname was not found, then resolve the server. */ + if (status == SILC_STATUS_ERR_NO_SUCH_NICK) { + /* This sends the IDENTIFY command to resolve the server. */ + silc_client_command_register(client, SILC_COMMAND_IDENTIFY, + NULL, NULL, + silc_client_command_reply_identify_i, 0, + ++conn->cmd_ident); + silc_client_command_send(client, conn, SILC_COMMAND_IDENTIFY, + conn->cmd_ident, 1, + 2, cmd->argv[1], cmd->argv_lens[1]); + silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, + conn->cmd_ident, + silc_client_command_getkey, + silc_client_command_dup(cmd)); + goto out; + } + + /* If server was not found, then we've resolved both nickname and + server and did not find anybody. */ + if (status == SILC_STATUS_ERR_NO_SUCH_SERVER) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", + silc_client_command_status_message(SILC_STATUS_ERR_NO_SUCH_NICK)); + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s", + silc_client_command_status_message(status)); + COMMAND_ERROR; + goto out; + } + + COMMAND_ERROR; + goto out; + } + } - /* Register pending callback which will recall this command callback with - same context and reprocesses the command. When reprocessing we actually - display the information on the screen. */ - silc_client_command_pending(conn, SILC_COMMAND_USERS, conn->cmd_ident, - silc_client_command_destructor, - silc_client_command_users, - silc_client_command_dup(cmd)); - cmd->pending = TRUE; - return; + idp = silc_id_payload_encode(server_entry->server_id, SILC_ID_SERVER); + } else { + idp = silc_id_payload_encode(client_entry->id, SILC_ID_CLIENT); } - if (cmd->pending) { - /* Pending command. Now we've resolved the information from server and - we are ready to display the information on screen. */ - int i; - SilcChannelUser chu; - - cmd->client->ops->say(cmd->client, conn, "Users on %s", - channel->channel_name); - - line = silc_calloc(4096, sizeof(*line)); - line_len = 4096; - silc_list_start(channel->clients); - while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) { - SilcClientEntry e = chu->client; - char *m, tmp[80], len1; - - memset(line, 0, sizeof(line_len)); - - if (strlen(e->nickname) + strlen(e->server) + 100 > line_len) { - silc_free(line); - line_len += strlen(e->nickname) + strlen(e->server) + 100; - line = silc_calloc(line_len, sizeof(*line)); - } - - memset(tmp, 0, sizeof(tmp)); - m = silc_client_chumode_char(chu->mode); + buffer = silc_command_payload_encode_va(SILC_COMMAND_GETKEY, 0, 1, + 1, idp->data, idp->len); + silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, NULL, + 0, NULL, NULL, buffer->data, buffer->len, TRUE); + silc_buffer_free(buffer); + silc_buffer_free(idp); - strncat(line, " ", 1); - strncat(line, e->nickname, strlen(e->nickname)); - strncat(line, e->server ? "@" : "", 1); + /* Notify application */ + COMMAND; - len1 = 0; - if (e->server) - len1 = strlen(e->server); - strncat(line, e->server ? e->server : "", len1 > 30 ? 30 : len1); + out: + silc_free(nickname); + silc_client_command_free(cmd); +} - len1 = strlen(line); - if (len1 >= 30) { - memset(&line[29], 0, len1 - 29); - } else { - for (i = 0; i < 30 - len1 - 1; i++) - strcat(line, " "); - } +/* Register a new command indicated by the `command' to the SILC client. + The `name' is optional command name. If provided the command may be + searched using the silc_client_command_find by that name. The + `command_function' is the function to be called when the command is + executed, and the `command_reply_function' is the function to be + called after the server has sent reply back to the command. + + The `ident' is optional identifier for the command. If non-zero + the `command_reply_function' for the command type `command' will be + called only if the command reply sent by server includes the + command identifier `ident'. Application usually does not need it + and set it to zero value. */ + +bool silc_client_command_register(SilcClient client, + SilcCommand command, + const char *name, + SilcCommandCb command_function, + SilcCommandCb command_reply_function, + SilcUInt8 max_args, + SilcUInt16 ident) +{ + SilcClientCommand cmd; - strncat(line, " H", 3); - strcat(tmp, m ? m : ""); - strncat(line, tmp, strlen(tmp)); + cmd = silc_calloc(1, sizeof(*cmd)); + cmd->cmd = command; + cmd->command = command_function; + cmd->reply = command_reply_function; + cmd->name = name ? strdup(name) : NULL; + cmd->max_args = max_args; + cmd->ident = ident; - if (strlen(tmp) < 5) - for (i = 0; i < 5 - strlen(tmp); i++) - strcat(line, " "); + silc_list_add(client->internal->commands, cmd); - strcat(line, e->username ? e->username : ""); + return TRUE; +} - cmd->client->ops->say(cmd->client, conn, "%s", line); +/* Unregister a command indicated by the `command' with command function + `command_function' and command reply function `command_reply_function'. + Returns TRUE if the command was found and unregistered. */ - if (m) - silc_free(m); +bool silc_client_command_unregister(SilcClient client, + SilcCommand command, + SilcCommandCb command_function, + SilcCommandCb command_reply_function, + SilcUInt16 ident) +{ + SilcClientCommand cmd; + + silc_list_start(client->internal->commands); + while ((cmd = silc_list_get(client->internal->commands)) != SILC_LIST_END) { + if (cmd->cmd == command && cmd->command == command_function && + cmd->reply == command_reply_function && cmd->ident == ident) { + silc_list_del(client->internal->commands, cmd); + silc_free(cmd->name); + silc_free(cmd); + return TRUE; } } - if (line) - silc_free(line); + return FALSE; +} - /* Notify application */ - COMMAND; +/* Register all default commands provided by the client library for the + application. */ - out: - silc_client_command_free(cmd); +void silc_client_commands_register(SilcClient client) +{ + silc_list_init(client->internal->commands, struct SilcClientCommandStruct, + next); + + SILC_CLIENT_CMD(whois, WHOIS, "WHOIS", 3); + SILC_CLIENT_CMD(whowas, WHOWAS, "WHOWAS", 3); + SILC_CLIENT_CMD(identify, IDENTIFY, "IDENTIFY", 3); + SILC_CLIENT_CMD(nick, NICK, "NICK", 2); + SILC_CLIENT_CMD(list, LIST, "LIST", 2); + SILC_CLIENT_CMD(topic, TOPIC, "TOPIC", 3); + SILC_CLIENT_CMD(invite, INVITE, "INVITE", 3); + SILC_CLIENT_CMD(quit, QUIT, "QUIT", 2); + SILC_CLIENT_CMD(kill, KILL, "KILL", 3); + SILC_CLIENT_CMD(info, INFO, "INFO", 2); + SILC_CLIENT_CMD(connect, CONNECT, "CONNECT", 3); + SILC_CLIENT_CMD(ping, PING, "PING", 2); + SILC_CLIENT_CMD(oper, OPER, "OPER", 3); + SILC_CLIENT_CMD(join, JOIN, "JOIN", 9); + SILC_CLIENT_CMD(motd, MOTD, "MOTD", 2); + SILC_CLIENT_CMD(umode, UMODE, "UMODE", 2); + SILC_CLIENT_CMD(cmode, CMODE, "CMODE", 4); + SILC_CLIENT_CMD(cumode, CUMODE, "CUMODE", 5); + SILC_CLIENT_CMD(kick, KICK, "KICK", 4); + SILC_CLIENT_CMD(ban, BAN, "BAN", 3); + SILC_CLIENT_CMD(close, CLOSE, "CLOSE", 3); + SILC_CLIENT_CMD(shutdown, SHUTDOWN, "SHUTDOWN", 1); + SILC_CLIENT_CMD(silcoper, SILCOPER, "SILCOPER", 3); + SILC_CLIENT_CMD(leave, LEAVE, "LEAVE", 2); + SILC_CLIENT_CMD(users, USERS, "USERS", 2); + SILC_CLIENT_CMD(getkey, GETKEY, "GETKEY", 2); +} + +/* Unregister all commands. */ + +void silc_client_commands_unregister(SilcClient client) +{ + SILC_CLIENT_CMDU(whois, WHOIS, "WHOIS"); + SILC_CLIENT_CMDU(whowas, WHOWAS, "WHOWAS"); + SILC_CLIENT_CMDU(identify, IDENTIFY, "IDENTIFY"); + SILC_CLIENT_CMDU(nick, NICK, "NICK"); + SILC_CLIENT_CMDU(list, LIST, "LIST"); + SILC_CLIENT_CMDU(topic, TOPIC, "TOPIC"); + SILC_CLIENT_CMDU(invite, INVITE, "INVITE"); + SILC_CLIENT_CMDU(quit, QUIT, "QUIT"); + SILC_CLIENT_CMDU(kill, KILL, "KILL"); + SILC_CLIENT_CMDU(info, INFO, "INFO"); + SILC_CLIENT_CMDU(connect, CONNECT, "CONNECT"); + SILC_CLIENT_CMDU(ping, PING, "PING"); + SILC_CLIENT_CMDU(oper, OPER, "OPER"); + SILC_CLIENT_CMDU(join, JOIN, "JOIN"); + SILC_CLIENT_CMDU(motd, MOTD, "MOTD"); + SILC_CLIENT_CMDU(umode, UMODE, "UMODE"); + SILC_CLIENT_CMDU(cmode, CMODE, "CMODE"); + SILC_CLIENT_CMDU(cumode, CUMODE, "CUMODE"); + SILC_CLIENT_CMDU(kick, KICK, "KICK"); + SILC_CLIENT_CMDU(ban, BAN, "BAN"); + SILC_CLIENT_CMDU(close, CLOSE, "CLOSE"); + SILC_CLIENT_CMDU(shutdown, SHUTDOWN, "SHUTDOWN"); + SILC_CLIENT_CMDU(silcoper, SILCOPER, "SILCOPER"); + SILC_CLIENT_CMDU(leave, LEAVE, "LEAVE"); + SILC_CLIENT_CMDU(users, USERS, "USERS"); + SILC_CLIENT_CMDU(getkey, GETKEY, "GETKEY"); }