SILC_CLIENT_CMD_REPLY(die, DIE),
SILC_CLIENT_CMD_REPLY(silcoper, SILCOPER),
SILC_CLIENT_CMD_REPLY(leave, LEAVE),
- SILC_CLIENT_CMD_REPLY(names, NAMES),
+ SILC_CLIENT_CMD_REPLY(users, USERS),
{ NULL, 0 },
};
SilcPacketContext *packet)
{
SilcBuffer buffer = packet->buffer;
+ SilcClientCommandReply *cmd;
SilcClientCommandReplyContext ctx;
SilcCommandPayload payload;
+ SilcCommand command;
+ unsigned short ident;
/* Get command reply payload from packet */
payload = silc_command_payload_parse(buffer);
ctx->payload = payload;
ctx->args = silc_command_get_args(ctx->payload);
ctx->packet = packet;
+ ident = silc_command_get_ident(ctx->payload);
/* Check for pending commands and mark to be exeucted */
- SILC_CLIENT_COMMAND_CHECK_PENDING(ctx);
-
+ silc_client_command_pending_check(sock->user_data, ctx,
+ silc_command_get(ctx->payload), ident);
+
/* Execute command reply */
- SILC_CLIENT_COMMAND_REPLY_EXEC(ctx);
+ command = silc_command_get(ctx->payload);
+ for (cmd = silc_command_reply_list; cmd->cb; cmd++)
+ if (cmd->cmd == command)
+ break;
+
+ if (cmd == NULL || !cmd->cb) {
+ silc_free(ctx);
+ return;
+ }
+
+ cmd->cb(ctx);
}
/* Returns status message string */
if (realname)
client_entry->realname = strdup(realname);
+ id_cache->data = client_entry->nickname;
+
silc_free(client_id);
}
cmd->client->ops->say(cmd->client, conn, "%s", buf);
/* Notify application */
- COMMAND_REPLY((ARGS, client_entry, nickname,
- username, realname, NULL, NULL));
+ COMMAND_REPLY((ARGS, client_entry, nickname, username, realname,
+ NULL, NULL));
}
/* Received reply for WHOIS command. This maybe called several times
silc_client_command_reply_whois_print(cmd, status);
}
+ /* Execute any pending command callbacks */
SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_WHOIS);
out:
if (username)
client_entry->username = strdup(username);
+
+ id_cache->data = client_entry->nickname;
+
silc_free(client_id);
}
}
}
+ /* Execute any pending command callbacks */
SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_IDENTIFY);
out:
/* Notify application */
COMMAND_REPLY((ARGS, conn->local_entry));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_NICK);
+
out:
silc_client_command_reply_free(cmd);
}
/* Notify application */
COMMAND_REPLY((ARGS, channel, topic));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_TOPIC);
+
out:
silc_client_command_reply_free(cmd);
}
/* Notify application */
COMMAND_REPLY((ARGS));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_INVITE);
+
silc_client_command_reply_free(cmd);
}
/* Notify application */
COMMAND_REPLY((ARGS, NULL, (char *)tmp));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_INFO);
+
out:
silc_client_command_reply_free(cmd);
}
silc_free(id);
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_PING);
+
out:
silc_client_command_reply_free(cmd);
}
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcClient client = cmd->client;
SilcCommandStatus status;
- SilcIDPayload idp;
+ SilcIDPayload idp = NULL;
unsigned int argc, mode, len;
- char *topic, *tmp, *channel_name;
+ char *topic, *tmp, *channel_name = NULL;
+ SilcBuffer keyp;
SILC_LOG_DEBUG(("Start"));
}
argc = silc_argument_get_arg_num(cmd->args);
- if (argc < 3 || argc > 5) {
+ if (argc < 3 || argc > 9) {
cmd->client->ops->say(cmd->client, conn,
"Cannot join channel: Bad reply packet");
COMMAND_REPLY_ERROR;
cmd->client->ops->say(cmd->client, conn,
"Cannot join channel: Bad reply packet");
COMMAND_REPLY_ERROR;
+ silc_free(channel_name);
goto out;
}
idp = silc_id_payload_parse_data(tmp, len);
else
mode = 0;
+ /* Get channel key */
+ tmp = silc_argument_get_arg_type(cmd->args, 6, &len);
+ if (!tmp) {
+ silc_id_payload_free(idp);
+ silc_free(channel_name);
+ goto out;
+ }
+ keyp = silc_buffer_alloc(len);
+ silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
+ silc_buffer_put(keyp, tmp, len);
+
/* Get topic */
- topic = silc_argument_get_arg_type(cmd->args, 5, NULL);
+ topic = silc_argument_get_arg_type(cmd->args, 8, NULL);
/* Save received Channel ID */
silc_client_new_channel_id(cmd->client, cmd->sock, channel_name,
mode, idp);
silc_id_payload_free(idp);
+ /* Save channel key */
+ silc_client_save_channel_key(conn, keyp, conn->current_channel);
+ silc_buffer_free(keyp);
+
if (topic)
client->ops->say(cmd->client, conn,
"Topic for %s: %s", channel_name, topic);
COMMAND_REPLY((ARGS, channel_name, conn->current_channel, mode,
NULL, NULL, topic));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_JOIN);
+
out:
silc_client_command_reply_free(cmd);
}
/* Notify application */
COMMAND_REPLY((ARGS, motd));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_MOTD);
+
out:
silc_client_command_reply_free(cmd);
}
/* Notify application */
COMMAND_REPLY((ARGS, tmp));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_CMODE);
+
out:
silc_client_command_reply_free(cmd);
}
COMMAND_REPLY((ARGS, tmp, (SilcClientEntry)id_cache->context));
silc_free(client_id);
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_CUMODE);
+
out:
silc_client_command_reply_free(cmd);
}
/* Notify application */
COMMAND_REPLY((ARGS));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_LEAVE);
+
silc_client_command_reply_free(cmd);
}
-/* Reply to NAMES command. Received list of client names on the channel
- we requested. */
+/* Reply to USERS command. Received list of client ID's and theirs modes
+ on the channel we requested. */
-SILC_CLIENT_CMD_REPLY_FUNC(names)
+SILC_CLIENT_CMD_REPLY_FUNC(users)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcCommandStatus status;
SilcIDCacheEntry id_cache = NULL;
SilcChannelEntry channel;
+ SilcChannelUser chu;
SilcChannelID *channel_id = NULL;
SilcBuffer client_id_list;
SilcBuffer client_mode_list;
unsigned char *tmp;
- char *name_list, *cp;
- int i, k, len1, len2, list_count = 0;
+ unsigned int tmp_len, list_count;
+ int i;
+ unsigned char **res_argv = NULL;
+ unsigned int *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0;
SILC_LOG_DEBUG(("Start"));
}
/* Get channel ID */
- tmp = silc_argument_get_arg_type(cmd->args, 2, &len1);
- if (!tmp) {
- cmd->client->ops->say(cmd->client, conn,
- "Cannot Channel ID: Bad reply packet");
- COMMAND_REPLY_ERROR;
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
+ if (!tmp)
goto out;
- }
- channel_id = silc_id_payload_parse_id(tmp, len1);
+ channel_id = silc_id_payload_parse_id(tmp, tmp_len);
- /* Get the name list of the channel */
- name_list = silc_argument_get_arg_type(cmd->args, 3, &len1);
- if (!name_list) {
- cmd->client->ops->say(cmd->client, conn,
- "Cannot get user list: Bad reply packet");
- COMMAND_REPLY_ERROR;
+ /* Get the list count */
+ tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
+ if (!tmp)
goto out;
- }
+ SILC_GET32_MSB(list_count, tmp);
/* Get Client ID list */
- tmp = silc_argument_get_arg_type(cmd->args, 4, &len2);
- if (!tmp) {
- cmd->client->ops->say(cmd->client, conn,
- "Cannot get user list: Bad reply packet");
- COMMAND_REPLY_ERROR;
+ tmp = silc_argument_get_arg_type(cmd->args, 4, &tmp_len);
+ if (!tmp)
goto out;
- }
- client_id_list = silc_buffer_alloc(len2);
- silc_buffer_pull_tail(client_id_list, len2);
- silc_buffer_put(client_id_list, tmp, len2);
+ client_id_list = silc_buffer_alloc(tmp_len);
+ silc_buffer_pull_tail(client_id_list, tmp_len);
+ silc_buffer_put(client_id_list, tmp, tmp_len);
/* Get client mode list */
- tmp = silc_argument_get_arg_type(cmd->args, 5, &len2);
- if (!tmp) {
- cmd->client->ops->say(cmd->client, conn,
- "Cannot get user list: Bad reply packet");
- COMMAND_REPLY_ERROR;
+ tmp = silc_argument_get_arg_type(cmd->args, 5, &tmp_len);
+ if (!tmp)
goto out;
- }
- client_mode_list = silc_buffer_alloc(len2);
- silc_buffer_pull_tail(client_mode_list, len2);
- silc_buffer_put(client_mode_list, tmp, len2);
+ client_mode_list = silc_buffer_alloc(tmp_len);
+ silc_buffer_pull_tail(client_mode_list, tmp_len);
+ silc_buffer_put(client_mode_list, tmp, tmp_len);
- /* Get the channel name */
+ /* Get channel entry */
if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- SILC_ID_CHANNEL, &id_cache)) {
+ SILC_ID_CHANNEL, &id_cache)) {
COMMAND_REPLY_ERROR;
goto out;
}
-
channel = (SilcChannelEntry)id_cache->context;
- /* Remove commas from list */
- for (i = 0; i < len1; i++)
- if (name_list[i] == ',') {
- name_list[i] = ' ';
- list_count++;
- }
- list_count++;
-
- /* Remove old client list from channel, if exists */
- if (channel->clients) {
- silc_free(channel->clients);
- channel->clients = NULL;
- channel->clients_count = 0;
+ /* Remove old client list from channel. */
+ silc_list_start(channel->clients);
+ while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) {
+ silc_list_del(channel->clients, chu);
+ silc_free(chu);
}
- /* Allocate room for clients in the channel */
- channel->clients = silc_calloc(list_count, sizeof(*channel->clients));
-
- /* Cache the received name list, client ID's and modes. This cache expires
+ /* Cache the received Client ID's and modes. 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;
+ some user has joined or leaved the channel. XXX! */
for (i = 0; i < list_count; i++) {
- int nick_len = strcspn(name_list, " ");
unsigned short idp_len;
unsigned int mode;
- char *nickname = silc_calloc(nick_len + 1, sizeof(*nickname));
SilcClientID *client_id;
SilcClientEntry client;
- memcpy(nickname, name_list, nick_len);
+ /* Client ID */
SILC_GET16_MSB(idp_len, client_id_list->data + 2);
idp_len += 4;
client_id = silc_id_payload_parse_id(client_id_list->data, idp_len);
silc_buffer_pull(client_id_list, idp_len);
-
+
+ /* Mode */
SILC_GET32_MSB(mode, client_mode_list->data);
silc_buffer_pull(client_mode_list, 4);
/* Check if we have this client cached already. */
if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
SILC_ID_CLIENT, &id_cache)) {
- client = silc_calloc(1, sizeof(*client));
- client->id = client_id;
- silc_parse_nickname(nickname, &client->nickname, &client->server,
- &client->num);
- silc_free(nickname);
-
- /* Add client to cache */
- silc_idcache_add(conn->client_cache, client->nickname, SILC_ID_CLIENT,
- client_id, (void *)client, TRUE);
+ /* No we don't have it, query it from the server. Assemble argument
+ table that will be sent fr the IDENTIFY command later. */
+ res_argv = silc_realloc(res_argv, sizeof(*res_argv) *
+ (res_argc + 1));
+ res_argv_lens = silc_realloc(res_argv_lens, sizeof(*res_argv_lens) *
+ (res_argc + 1));
+ res_argv_types = silc_realloc(res_argv_types, sizeof(*res_argv_types) *
+ (res_argc + 1));
+ res_argv[res_argc] = client_id_list->data;
+ res_argv_lens[res_argc] = idp_len;
+ res_argv_types[res_argc] = res_argc + 3;
+ res_argc++;
} else {
+ /* Found the client, join it to the channel */
client = (SilcClientEntry)id_cache->context;
+ chu = silc_calloc(1, sizeof(*chu));
+ chu->client = client;
+ chu->mode = mode;
+ silc_list_add(channel->clients, chu);
+
silc_free(client_id);
- silc_free(nickname);
id_cache = NULL;
}
-
- channel->clients[channel->clients_count].client = client;
- channel->clients[channel->clients_count].mode = mode;
- channel->clients_count++;
-
- name_list += nick_len + 1;
}
- name_list = cp;
- for (i = 0; i < list_count; i++) {
- int c;
- int nick_len = strcspn(name_list, " ");
- char *nickname = silc_calloc(nick_len + 1, sizeof(*nickname));
- memcpy(nickname, name_list, nick_len);
-
- for (c = 0, k = 0; k < channel->clients_count; k++) {
- if (channel->clients[k].client &&
- !strncmp(channel->clients[k].client->nickname,
- nickname, strlen(channel->clients[k].client->nickname))) {
- char t[8];
-
- if (!c) {
- c++;
- continue;
- }
-
- memset(t, 0, sizeof(t));
- channel->clients[k].client->nickname =
- silc_calloc(strlen(nickname) + 8, sizeof(*channel->clients[k].
- client->nickname));
- snprintf(t, sizeof(t), "[%d]", c++);
- strncat(channel->clients[k].client->nickname, t, strlen(t));
- strncat(channel->clients[k].client->nickname, nickname,
- strlen(nickname));
- }
- }
-
- silc_free(nickname);
+ /* Query the client information from server if the list included clients
+ that we don't know about. */
+ if (res_argc) {
+ SilcBuffer res_cmd;
+
+ /* Send the IDENTIFY command to server */
+ res_cmd = silc_command_payload_encode(SILC_COMMAND_IDENTIFY,
+ res_argc, res_argv, res_argv_lens,
+ res_argv_types, ++conn->cmd_ident);
+ silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND,
+ NULL, 0, NULL, NULL, res_cmd->data, res_cmd->len,
+ TRUE);
+
+ /* Register pending command callback. After we've received the IDENTIFY
+ command reply we will reprocess this command reply by re-calling this
+ USERS command reply callback. */
+ silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident,
+ silc_client_command_reply_users, cmd);
+
+ silc_buffer_free(res_cmd);
+ if (channel_id)
+ silc_free(channel_id);
+
+ for (i = 0; i < res_argc; i++)
+ silc_free(res_argv[i]);
+ silc_free(res_argv);
+ silc_free(res_argv_lens);
+ silc_free(res_argv_types);
+ return;
}
- /* XXX hmm... actually it is applications business to display this
- information. We should just pass (as we do) the data to application and
- let it to parse it and display it the way it wants. */
+ /* We have all the clients on the channel cached now. Create a nice
+ output for user interface and notify application. */
+
if (cmd->callback) {
+ /* User has called USERS command on user interface. */
cmd->client->ops->say(cmd->client, conn, "Users on %s",
channel->channel_name);
- for (k = 0; k < channel->clients_count; k++) {
- SilcClientEntry e = channel->clients[k].client;
- char *m, tmp[80], line[80];
+ silc_list_start(channel->clients);
+ while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) {
+ SilcClientEntry e = chu->client;
+ char *m, tmp[80], line[80], len1;
memset(line, 0, sizeof(line));
memset(tmp, 0, sizeof(tmp));
- m = silc_client_chumode_char(channel->clients[k].mode);
+ m = silc_client_chumode_char(chu->mode);
strcat(line, " ");
strcat(line, e->nickname);
}
} else {
- name_list = NULL;
- len1 = 0;
- for (k = 0; k < channel->clients_count; k++) {
- char *m, *n = channel->clients[k].client->nickname;
+ /* Server has sent us USERS reply even when we haven't actually sent
+ USERS command. This is normal behaviour when joining to a channel.
+ Display some nice information on the user interface. */
+ int k = 0, len1 = 0, len2 = 0;
+ char *name_list = NULL;
+
+ silc_list_start(channel->clients);
+ while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) {
+ char *m, *n = chu->client->nickname;
len2 = strlen(n);
len1 += len2;
name_list = silc_realloc(name_list, sizeof(*name_list) * (len1 + 3));
- m = silc_client_chumode_char(channel->clients[k].mode);
+ m = silc_client_chumode_char(chu->mode);
if (m) {
memcpy(name_list + (len1 - len2), m, strlen(m));
len1 += strlen(m);
memcpy(name_list + (len1 - len2), n, len2);
name_list[len1] = 0;
-
- if (k == channel->clients_count - 1)
+
+ if (k == silc_list_count(channel->clients) - 1)
break;
memcpy(name_list + len1, " ", 1);
len1++;
+ k++;
}
- cmd->client->ops->say(cmd->client, conn,
- "Users on %s: %s", channel->channel_name, name_list);
+ cmd->client->ops->say(cmd->client, conn, "Users on %s: %s",
+ channel->channel_name, name_list);
silc_free(name_list);
}
- name_list = silc_argument_get_arg_type(cmd->args, 3, &len1);
-
/* Notify application */
- COMMAND_REPLY((ARGS, channel, name_list, client_id_list->head,
+ COMMAND_REPLY((ARGS, channel, client_id_list->head,
client_mode_list->head));
+ /* Execute any pending command callbacks */
+ SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_USERS);
+
silc_buffer_free(client_id_list);
silc_buffer_free(client_mode_list);
projects / silc.git / blobdiff