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, 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, 1),
SILC_CLIENT_CMD(kill, KILL, "KILL",
{
}
+/* Command TOPIC. Sets/shows topic on a channel. */
+
SILC_CLIENT_CMD_FUNC(topic)
{
+ SilcClientCommandContext cmd = (SilcClientCommandContext)context;
+ SilcClientConnection conn = cmd->conn;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcChannelEntry channel;
+ SilcBuffer buffer;
+ unsigned char *id_string;
+ char *name;
+
+ 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: /TOPIC <channel> [<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");
+ COMMAND_ERROR;
+ goto out;
+ }
+ name = conn->current_channel->channel_name;
+ } else {
+ name = cmd->argv[1];
+ }
+
+ if (!conn->current_channel) {
+ cmd->client->ops->say(cmd->client, conn, "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;
+ }
+
+ channel = (SilcChannelEntry)id_cache->context;
+
+ /* Send TOPIC command to the server */
+ id_string = silc_id_id2str(id_cache->id, SILC_ID_CHANNEL);
+ if (cmd->argc > 2)
+ buffer = silc_command_encode_payload_va(SILC_COMMAND_TOPIC, 2,
+ 1, id_string, SILC_ID_CHANNEL_LEN,
+ 2, cmd->argv[2],
+ strlen(cmd->argv[2]));
+ else
+ buffer = silc_command_encode_payload_va(SILC_COMMAND_TOPIC, 1,
+ 1, id_string, SILC_ID_CHANNEL_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);
+
+ /* Notify application */
+ COMMAND;
+
+ out:
+ silc_client_command_free(cmd);
}
/* Command INVITE. Invites specific client to join a channel. */
SILC_CLIENT_CMD_FUNC(motd)
{
+ SilcClientCommandContext cmd = (SilcClientCommandContext)context;
+ SilcClientConnection conn = cmd->conn;
+ SilcBuffer buffer;
+
+ if (!cmd->conn) {
+ SILC_NOT_CONNECTED(cmd->client, cmd->conn);
+ COMMAND_ERROR;
+ goto out;
+ }
+
+ if (cmd->argc < 1 || cmd->argc > 1) {
+ cmd->client->ops->say(cmd->client, conn,
+ "Usage: /MOTD");
+ COMMAND_ERROR;
+ goto out;
+ }
+
+ /* Send TOPIC command to the server */
+ buffer = silc_command_encode_payload_va(SILC_COMMAND_MOTD, 1,
+ 2, conn->remote_host,
+ strlen(conn->remote_host));
+ 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);
}
SILC_CLIENT_CMD_FUNC(umode)
if (cmd->argv[1][0] == '*') {
if (!conn->current_channel) {
- cmd->client->ops->say(cmd->client, conn, "You are not on any chanenl");
+ cmd->client->ops->say(cmd->client, conn, "You are not on any channel");
COMMAND_ERROR;
goto out;
}
}
}
+static void
+silc_client_command_reply_whois_print(SilcClientCommandReplyContext cmd,
+ SilcCommandStatus status)
+{
+ char buf[256];
+ int argc, len;
+ unsigned char *id_data;
+ char *nickname = NULL, *username = NULL;
+ char *realname = NULL;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+
+ memset(buf, 0, sizeof(buf));
+
+ argc = silc_command_get_arg_num(cmd->payload);
+ id_data = silc_command_get_arg_type(cmd->payload, 2, NULL);
+
+ nickname = silc_command_get_arg_type(cmd->payload, 3, &len);
+ if (nickname) {
+ strncat(buf, nickname, len);
+ strncat(buf, " is ", 4);
+ }
+
+ username = silc_command_get_arg_type(cmd->payload, 4, &len);
+ if (username) {
+ strncat(buf, username, len);
+ }
+
+ realname = silc_command_get_arg_type(cmd->payload, 5, &len);
+ if (realname) {
+ strncat(buf, " (", 2);
+ strncat(buf, realname, len);
+ strncat(buf, ")", 1);
+ }
+
+ cmd->client->ops->say(cmd->client, conn, "%s", buf);
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS));
+}
+
/* Received reply for WHOIS command. This maybe called several times
for one WHOIS command as server may reply with list of results. */
/* Sends to application: (no arguments) */
tmp = silc_command_get_arg_type(cmd->payload, 1, NULL);
SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (status != SILC_STATUS_OK &&
+ 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_command_get_arg_type(cmd->payload, 3, NULL);
/* Display one whois reply */
if (status == SILC_STATUS_OK) {
- char buf[256];
- int argc, len;
- unsigned char *id_data;
- char *nickname = NULL, *username = NULL;
- char *realname = NULL;
-
- memset(buf, 0, sizeof(buf));
-
- argc = silc_command_get_arg_num(cmd->payload);
- id_data = silc_command_get_arg_type(cmd->payload, 2, NULL);
-
- nickname = silc_command_get_arg_type(cmd->payload, 3, &len);
- if (nickname) {
- strncat(buf, nickname, len);
- strncat(buf, " is ", 4);
- }
-
- username = silc_command_get_arg_type(cmd->payload, 4, &len);
- if (username) {
- strncat(buf, username, len);
- }
-
- realname = silc_command_get_arg_type(cmd->payload, 5, &len);
- if (realname) {
- strncat(buf, " (", 2);
- strncat(buf, realname, len);
- strncat(buf, ")", 1);
- }
-
-#if 0
- /* Save received Client ID to ID cache */
- /* XXX Maybe should not be saved as /MSG will get confused */
- id = silc_id_str2id(id_data, SILC_ID_CLIENT);
- client->current_conn->client_id_cache_count[(int)nickname[0] - 32] =
- silc_idcache_add(&client->current_conn->
- client_id_cache[(int)nickname[0] - 32],
- client->current_conn->
- client_id_cache_count[(int)nickname[0] - 32],
- strdup(nickname), SILC_ID_CLIENT, id, NULL);
-#endif
-
- cmd->client->ops->say(cmd->client, conn, "%s", buf);
-
- /* Notify application */
- COMMAND_REPLY((ARGS));
+ silc_client_command_reply_whois_print(cmd, status);
}
+ /* XXX list should not be displayed untill all items has been received. */
if (status == SILC_STATUS_LIST_START) {
+ silc_client_command_reply_whois_print(cmd, status);
+ }
+ if (status == SILC_STATUS_LIST_ITEM) {
+ silc_client_command_reply_whois_print(cmd, status);
}
if (status == SILC_STATUS_LIST_END) {
-
+ silc_client_command_reply_whois_print(cmd, status);
}
SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_WHOIS);
{
}
+/* Received reply to topic command. */
+/* Sends to application: SilcChannelID * (channel_id) and char * (topic) */
+
SILC_CLIENT_CMD_REPLY_FUNC(topic)
{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcCommandStatus status;
+ SilcChannelEntry channel;
+ SilcChannelID *channel_id = NULL;
+ SilcIDCacheEntry id_cache = NULL;
+ unsigned char *tmp, *id_string;
+ char *topic;
+ int argc;
+
+ tmp = silc_command_get_arg_type(cmd->payload, 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));
+ silc_client_command_reply_free(cmd);
+ COMMAND_REPLY_ERROR;
+ return;
+ }
+
+ argc = silc_command_get_arg_num(cmd->payload);
+ if (argc < 1 || argc > 3) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Take Channel ID */
+ id_string = silc_command_get_arg_type(cmd->payload, 2, NULL);
+ if (!id_string)
+ goto out;
+
+ channel_id = silc_id_str2id(id_string, SILC_ID_CHANNEL);
+
+ /* Take topic */
+ topic = silc_command_get_arg_type(cmd->payload, 3, NULL);
+ if (!topic)
+ goto out;
+
+ /* Get the channel name */
+ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
+ SILC_ID_CHANNEL, &id_cache)) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ channel = (SilcChannelEntry)id_cache->context;
+
+ cmd->client->ops->say(cmd->client, conn,
+ "Topic on channel %s: %s", channel->channel_name,
+ topic);
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, channel_id, topic));
+
+ out:
+ if (channel_id)
+ silc_free(channel_id);
+ silc_client_command_reply_free(cmd);
}
/* Received reply to invite command. */
}
argc = silc_command_get_arg_num(cmd->payload);
- if (argc < 3 || argc > 4) {
+ if (argc < 3 || argc > 5) {
cmd->client->ops->say(cmd->client, conn,
"Cannot join channel: Bad reply packet");
COMMAND_REPLY_ERROR;
silc_client_command_reply_free(cmd);
}
+/* Received reply for MOTD command */
+/* Sends to application: char * (motd) */
+
SILC_CLIENT_CMD_REPLY_FUNC(motd)
{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcCommandStatus status;
+ unsigned int argc, i;
+ unsigned char *tmp;
+ char *motd = NULL, *cp, line[256];
+
+ tmp = silc_command_get_arg_type(cmd->payload, 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;
+ return;
+ }
+
+ argc = silc_command_get_arg_num(cmd->payload);
+ if (argc > 2) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ if (argc == 2) {
+ motd = silc_command_get_arg_type(cmd->payload, 2, NULL);
+ if (!motd) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ i = 0;
+ cp = motd;
+ while(cp[i] != 0) {
+ if (cp[i++] == '\n') {
+ memset(line, 0, sizeof(line));
+ strncat(line, cp, i - 1);
+ cp += i;
+
+ if (i == 2)
+ line[0] = ' ';
+
+ cmd->client->ops->say(cmd->client, conn, "%s", line);
+
+ if (!strlen(cp))
+ break;
+ i = 0;
+ }
+ }
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, motd));
+
+ out:
+ silc_client_command_reply_free(cmd);
}
SILC_CLIENT_CMD_REPLY_FUNC(umode)
SilcChannelID *channel_id = NULL;
SilcBuffer client_id_list;
unsigned char *tmp;
- char *name_list;
- int i, len1, len2, list_count = 0;
+ char *name_list, *cp;
+ int i, k, len1, len2, list_count = 0;
SILC_LOG_DEBUG(("Start"));
name_list[i] = ' ';
list_count++;
}
+ list_count++;
+ }
- cmd->client->ops->say(cmd->client, conn,
- "Users on %s: %s", channel->channel_name, name_list);
+ if (channel->clients) {
+ silc_free(channel->clients);
+ channel->clients = NULL;
+ channel->clients_count = 0;
}
/* Cache the received name list and client ID's. This cache expires
whenever server sends notify message to channel. It means two things;
some user has joined or leaved the channel. */
+ cp = name_list;
for (i = 0; i < list_count; i++) {
int nick_len = strcspn(name_list, " ");
char *nickname = silc_calloc(nick_len, sizeof(*nickname));
client->id = client_id;
client->nickname = nickname;
+ /* Add client to cache */
silc_idcache_add(conn->client_cache, nickname, SILC_ID_CLIENT,
client_id, (void *)client, TRUE);
name_list = name_list + nick_len + 1;
+
+ /* Add client to channel */
+ channel->clients = silc_realloc(channel->clients,
+ sizeof(*channel->clients) *
+ (channel->clients_count + 1));
+ channel->clients[channel->clients_count] = client;
+ channel->clients_count++;
+ }
+
+ name_list = cp;
+ for (i = 0; i < list_count; i++) {
+ int c;
+ int nick_len = strcspn(name_list, " ");
+ char *nickname = silc_calloc(nick_len, sizeof(*nickname));
+ memcpy(nickname, name_list, nick_len);
+
+ for (c = 0, k = 0; k < channel->clients_count; k++) {
+ if (channel->clients[k] &&
+ !strncmp(channel->clients[k]->nickname,
+ nickname, strlen(channel->clients[k]->nickname))) {
+ char t[8];
+
+ if (!c) {
+ c++;
+ continue;
+ }
+
+ memset(t, 0, sizeof(t));
+ channel->clients[k]->nickname =
+ silc_calloc(strlen(nickname) + 8,
+ sizeof(*channel->clients[k]->nickname));
+ strncat(channel->clients[k]->nickname, nickname, strlen(nickname));
+ snprintf(t, sizeof(t), "[%d]", c++);
+ strncat(channel->clients[k]->nickname, t, strlen(t));
+ }
+ }
+
+ silc_free(nickname);
}
+ name_list = NULL;
+ len1 = 0;
+ for (k = 0; k < channel->clients_count; k++) {
+ char *n = channel->clients[k]->nickname;
+ len2 = strlen(n);
+ len1 += len2;
+ name_list = silc_realloc(name_list, sizeof(*name_list) * (len1 + 1));
+ memcpy(name_list + (len1 - len2), n, len2);
+ name_list[len1] = 0;
+
+ if (k == channel->clients_count - 1)
+ break;
+ memcpy(name_list + len1, " ", 1);
+ len1++;
+ }
+
+ cmd->client->ops->say(cmd->client, conn,
+ "Users on %s: %s", channel->channel_name, name_list);
+
+ silc_free(name_list);
silc_buffer_free(client_id_list);
out:
projects / silc.git / commitdiff