}
static void
-silc_client_command_reply_whois_print(SilcClientCommandReplyContext cmd,
- SilcCommandStatus status)
+silc_client_command_reply_whois_save(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;
SilcClientID *client_id;
SilcIDCacheEntry id_cache = NULL;
SilcClientEntry client_entry = NULL;
- SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
-
- memset(buf, 0, sizeof(buf));
+ int argc, len;
+ unsigned char *id_data, *tmp;
+ char *nickname = NULL, *username = NULL;
+ char *realname = NULL;
+ unsigned int idle = 0;
argc = silc_argument_get_arg_num(cmd->args);
}
nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
- if (nickname) {
- strncat(buf, nickname, len);
- strncat(buf, " is ", 4);
- }
-
username = silc_argument_get_arg_type(cmd->args, 4, &len);
- if (username) {
- strncat(buf, username, len);
- }
-
realname = silc_argument_get_arg_type(cmd->args, 5, &len);
- if (realname) {
- strncat(buf, " (", 2);
- strncat(buf, realname, len);
- strncat(buf, ")", 1);
+ if (!nickname || !username || !realname) {
+ COMMAND_REPLY_ERROR;
+ return;
}
-
+
+ tmp = silc_argument_get_arg_type(cmd->args, 7, &len);
+ if (tmp)
+ SILC_GET32_MSB(idle, tmp);
+
/* 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)) {
+ SILC_LOG_DEBUG(("Adding new client entry"));
+
client_entry = silc_calloc(1, sizeof(*client_entry));
client_entry->id = client_id;
silc_parse_nickname(nickname, &client_entry->nickname,
if (client_entry->realname)
silc_free(client_entry->realname);
+ SILC_LOG_DEBUG(("Updating client entry"));
+
silc_parse_nickname(nickname, &client_entry->nickname,
&client_entry->server, &client_entry->num);
client_entry->username = strdup(username);
silc_free(client_id);
}
- if (!cmd->callback)
- cmd->client->ops->say(cmd->client, conn, "%s", buf);
-
/* Notify application */
- COMMAND_REPLY((ARGS, client_entry, nickname, username, realname,
- NULL, NULL));
+ if (!cmd->callback)
+ COMMAND_REPLY((ARGS, client_entry, nickname, username, realname,
+ NULL, idle));
}
/* Received reply for WHOIS command. This maybe called several times
}
/* Display one whois reply */
- if (status == SILC_STATUS_OK) {
- 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_OK)
+ silc_client_command_reply_whois_save(cmd, status);
- if (status == SILC_STATUS_LIST_ITEM) {
- silc_client_command_reply_whois_print(cmd, status);
- }
+ /* List */
+ if (status == SILC_STATUS_LIST_START ||
+ status == SILC_STATUS_LIST_ITEM ||
+ status == SILC_STATUS_LIST_END)
+ silc_client_command_reply_whois_save(cmd, status);
- if (status == SILC_STATUS_LIST_END) {
- silc_client_command_reply_whois_print(cmd, status);
+ /* Pending callbacks are not executed if this was an list entry */
+ if (status != SILC_STATUS_OK &&
+ status != SILC_STATUS_LIST_END) {
+ silc_client_command_reply_free(cmd);
+ return;
}
/* Execute any pending command callbacks */
}
+static void
+silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd,
+ SilcCommandStatus status)
+{
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcClientID *client_id;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcClientEntry client_entry = NULL;
+ int argc, len;
+ unsigned char *id_data;
+ char *nickname = NULL, *username = NULL;
+
+ argc = silc_argument_get_arg_num(cmd->args);
+
+ id_data = silc_argument_get_arg_type(cmd->args, 2, &len);
+ if (!id_data) {
+ COMMAND_REPLY_ERROR;
+ return;
+ }
+
+ client_id = silc_id_payload_parse_id(id_data, len);
+ if (!client_id) {
+ COMMAND_REPLY_ERROR;
+ return;
+ }
+
+ nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
+ username = silc_argument_get_arg_type(cmd->args, 4, &len);
+
+ /* 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)) {
+ SILC_LOG_DEBUG(("Adding new client entry"));
+
+ client_entry = silc_calloc(1, sizeof(*client_entry));
+ client_entry->id = client_id;
+ silc_parse_nickname(nickname, &client_entry->nickname,
+ &client_entry->server, &client_entry->num);
+ if (username)
+ client_entry->username = strdup(username);
+
+ /* Add client to cache */
+ silc_idcache_add(conn->client_cache, client_entry->nickname,
+ SILC_ID_CLIENT, client_id, (void *)client_entry, TRUE);
+ } else {
+ client_entry = (SilcClientEntry)id_cache->context;
+ if (client_entry->nickname)
+ silc_free(client_entry->nickname);
+ if (client_entry->server)
+ silc_free(client_entry->server);
+ if (username && client_entry->username)
+ silc_free(client_entry->username);
+
+ SILC_LOG_DEBUG(("Updating client entry"));
+
+ silc_parse_nickname(nickname, &client_entry->nickname,
+ &client_entry->server, &client_entry->num);
+
+ if (username)
+ client_entry->username = strdup(username);
+
+ id_cache->data = client_entry->nickname;
+ silc_idcache_sort_by_data(conn->client_cache);
+
+ silc_free(client_id);
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, client_entry, nickname, username));
+}
+
/* Received reply for IDENTIFY command. This maybe called several times
for one IDENTIFY command as server may reply with list of results.
This is totally silent and does not print anything on screen. */
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcClientEntry client_entry;
- SilcIDCacheEntry id_cache = NULL;
SilcCommandStatus status;
unsigned char *tmp;
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ 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_argument_get_arg_type(cmd->args, 3, NULL);
}
}
- /* Display one whois reply */
- if (status == SILC_STATUS_OK) {
- unsigned int len;
- unsigned char *id_data;
- char *nickname;
- char *username;
- SilcClientID *client_id;
-
- id_data = silc_argument_get_arg_type(cmd->args, 2, &len);
- if (!id_data)
- goto out;
- client_id = silc_id_payload_parse_id(id_data, len);
- if (!client_id)
- goto out;
-
- nickname = silc_argument_get_arg_type(cmd->args, 3, NULL);
- username = silc_argument_get_arg_type(cmd->args, 4, NULL);
+ /* Save one IDENTIFY entry */
+ if (status == SILC_STATUS_OK)
+ silc_client_command_reply_identify_save(cmd, status);
- if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
- SILC_ID_CLIENT, &id_cache)) {
- client_entry = silc_calloc(1, sizeof(*client_entry));
- client_entry->id = client_id;
- silc_parse_nickname(nickname, &client_entry->nickname,
- &client_entry->server, &client_entry->num);
- if (username)
- client_entry->username = strdup(username);
-
- /* Add client to cache */
- silc_idcache_add(conn->client_cache, client_entry->nickname,
- SILC_ID_CLIENT, client_id, (void *)client_entry, TRUE);
- } else {
- client_entry = (SilcClientEntry)id_cache->context;
- if (client_entry->nickname)
- silc_free(client_entry->nickname);
- if (client_entry->server)
- silc_free(client_entry->server);
- if (username && client_entry->username)
- silc_free(client_entry->username);
-
- silc_parse_nickname(nickname, &client_entry->nickname,
- &client_entry->server, &client_entry->num);
-
- if (username)
- client_entry->username = strdup(username);
-
- id_cache->data = client_entry->nickname;
- silc_idcache_sort_by_data(conn->client_cache);
-
- silc_free(client_id);
- }
- }
-
- if (status == SILC_STATUS_LIST_START) {
-
- }
-
- if (status == SILC_STATUS_LIST_END) {
+ /* List */
+ if (status == SILC_STATUS_LIST_START ||
+ status == SILC_STATUS_LIST_ITEM ||
+ status == SILC_STATUS_LIST_END)
+ silc_client_command_reply_identify_save(cmd, status);
+ /* Pending callbacks are not executed if this was an list entry */
+ if (status != SILC_STATUS_OK &&
+ status != SILC_STATUS_LIST_END) {
+ silc_client_command_reply_free(cmd);
+ return;
}
/* Execute any pending command callbacks */
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcClient client = cmd->client;
SilcCommandStatus status;
SilcIDPayload idp = NULL;
SilcChannelEntry channel;
- unsigned int argc, mode, len;
+ SilcIDCacheEntry id_cache = NULL;
+ SilcChannelUser chu;
+ unsigned int argc, mode, len, list_count;
char *topic, *tmp, *channel_name = NULL, *hmac;
- SilcBuffer keyp;
+ SilcBuffer keyp, client_id_list, client_mode_list;
+ int i;
SILC_LOG_DEBUG(("Start"));
}
argc = silc_argument_get_arg_num(cmd->args);
- if (argc < 3 || argc > 9) {
+ if (argc < 7 || argc > 14) {
cmd->client->ops->say(cmd->client, conn,
"Cannot join channel: Bad reply packet");
COMMAND_REPLY_ERROR;
}
/* Get channel mode */
- tmp = silc_argument_get_arg_type(cmd->args, 4, NULL);
+ tmp = silc_argument_get_arg_type(cmd->args, 5, NULL);
if (tmp)
SILC_GET32_MSB(mode, tmp);
else
mode = 0;
/* Get channel key */
- tmp = silc_argument_get_arg_type(cmd->args, 6, &len);
+ tmp = silc_argument_get_arg_type(cmd->args, 7, &len);
if (!tmp) {
silc_id_payload_free(idp);
silc_free(channel_name);
silc_buffer_put(keyp, tmp, len);
/* Get topic */
- topic = silc_argument_get_arg_type(cmd->args, 9, NULL);
+ topic = silc_argument_get_arg_type(cmd->args, 10, NULL);
/* Save received Channel ID. This actually creates the channel */
channel = silc_client_new_channel_id(cmd->client, cmd->sock, channel_name,
silc_id_payload_free(idp);
/* Get hmac */
- hmac = silc_argument_get_arg_type(cmd->args, 10, NULL);
+ hmac = silc_argument_get_arg_type(cmd->args, 11, NULL);
if (hmac) {
if (!silc_hmac_alloc(hmac, NULL, &channel->hmac)) {
cmd->client->ops->say(cmd->client, conn,
}
}
+ /* Get the list count */
+ tmp = silc_argument_get_arg_type(cmd->args, 12, &len);
+ if (!tmp)
+ goto out;
+ SILC_GET32_MSB(list_count, tmp);
+
+ /* Get Client ID list */
+ tmp = silc_argument_get_arg_type(cmd->args, 13, &len);
+ if (!tmp)
+ goto out;
+
+ client_id_list = silc_buffer_alloc(len);
+ silc_buffer_pull_tail(client_id_list, len);
+ silc_buffer_put(client_id_list, tmp, len);
+
+ /* Get client mode list */
+ tmp = silc_argument_get_arg_type(cmd->args, 14, &len);
+ if (!tmp)
+ goto out;
+
+ client_mode_list = silc_buffer_alloc(len);
+ silc_buffer_pull_tail(client_mode_list, len);
+ silc_buffer_put(client_mode_list, tmp, len);
+
+ /* Add clients we received in the reply to the channel */
+ for (i = 0; i < list_count; i++) {
+ unsigned short idp_len;
+ unsigned int mode;
+ SilcClientID *client_id;
+ SilcClientEntry client_entry;
+
+ /* 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);
+ if (!client_id)
+ continue;
+
+ /* Mode */
+ SILC_GET32_MSB(mode, client_mode_list->data);
+
+ /* 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)) {
+ /* No, we don't have it, add entry for it. */
+ client_entry = silc_calloc(1, sizeof(*client_entry));
+ client_entry->id = silc_id_dup(client_id, SILC_ID_CLIENT);
+ silc_idcache_add(conn->client_cache, NULL, SILC_ID_CLIENT,
+ client_entry->id, (void *)client_entry, FALSE);
+ } else {
+ /* Yes, we have it already */
+ client_entry = (SilcClientEntry)id_cache->context;
+ }
+
+ /* Join the client to the channel */
+ chu = silc_calloc(1, sizeof(*chu));
+ chu->client = client_entry;
+ chu->mode = mode;
+ silc_list_add(channel->clients, chu);
+ silc_free(client_id);
+
+ silc_buffer_pull(client_id_list, idp_len);
+ silc_buffer_pull(client_mode_list, 4);
+ }
+ silc_buffer_push(client_id_list, client_id_list->data -
+ client_id_list->head);
+ silc_buffer_push(client_mode_list, client_mode_list->data -
+ client_mode_list->head);
+
/* Save channel key */
silc_client_save_channel_key(conn, keyp, channel);
- silc_buffer_free(keyp);
-
- if (topic)
- client->ops->say(cmd->client, conn,
- "Topic for %s: %s", channel_name, topic);
/* Notify application */
- COMMAND_REPLY((ARGS, channel_name, channel, mode, NULL, NULL, topic, hmac));
+ COMMAND_REPLY((ARGS, channel_name, channel, mode, 0, keyp->head, NULL,
+ NULL, topic, hmac, list_count, client_id_list,
+ client_mode_list));
/* Execute any pending command callbacks */
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
+ silc_buffer_free(keyp);
+ silc_buffer_free(client_id_list);
+ silc_buffer_free(client_mode_list);
+
out:
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN);
silc_client_command_reply_free(cmd);
return;
}
- /* We have all the clients on the channel cached now. Create a nice
- output for user interface and notify application. */
-
- if (!cmd->callback) {
- /* 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(chu->mode);
- if (m) {
- memcpy(name_list + (len1 - len2), m, strlen(m));
- len1 += strlen(m);
- silc_free(m);
- }
-
- memcpy(name_list + (len1 - len2), n, len2);
- name_list[len1] = 0;
-
- 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);
- silc_free(name_list);
- }
-
/* Notify application */
- COMMAND_REPLY((ARGS, channel, client_id_list->head,
- client_mode_list->head));
+ COMMAND_REPLY((ARGS, channel, list_count, client_id_list, client_mode_list));
/* Execute any pending command callbacks */
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
projects / silc.git / blobdiff