Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
- Copyright (C) 1997 - 2000 Pekka Riikonen
+ Copyright (C) 1997 - 2001 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
#define COMMAND_CHECK_STATUS \
do { \
+ SILC_LOG_DEBUG(("Start")); \
SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); \
if (status != SILC_STATUS_OK) { \
silc_server_command_reply_free(cmd); \
#define COMMAND_CHECK_STATUS_LIST \
do { \
+ SILC_LOG_DEBUG(("Start")); \
SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL)); \
if (status != SILC_STATUS_OK && \
status != SILC_STATUS_LIST_START && \
SILC_SERVER_CMD_REPLY(join, JOIN),
SILC_SERVER_CMD_REPLY(whois, WHOIS),
SILC_SERVER_CMD_REPLY(identify, IDENTIFY),
- SILC_SERVER_CMD_REPLY(names, NAMES),
+ SILC_SERVER_CMD_REPLY(users, USERS),
{ NULL, 0 },
};
return FALSE;
client_id = silc_id_payload_parse_id(id_data, id_len);
+ if (!client_id)
+ return FALSE;
/* Check if we have this client cached already. */
SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
SilcCommandStatus status;
- SILC_LOG_DEBUG(("Start"));
-
COMMAND_CHECK_STATUS_LIST;
if (!silc_server_command_reply_whois_save(cmd))
goto out;
- /* XXX */
-
- /* Process one identify reply */
- if (status == SILC_STATUS_OK) {
-
- }
-
- if (status == SILC_STATUS_LIST_START) {
-
- }
-
- if (status == SILC_STATUS_LIST_ITEM) {
-
- }
-
- if (status == SILC_STATUS_LIST_END) {
-
- }
-
/* Execute any pending commands */
SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_WHOIS);
return FALSE;
client_id = silc_id_payload_parse_id(id_data, id_len);
+ if (!client_id)
+ return FALSE;
/* Check if we have this client cached already. */
}
}
- if (nickname && client->nickname) {
+ if (nickname && client->nickname)
silc_free(client->nickname);
+
+ if (nickname)
client->nickname = nick;
- }
if (username && client->username) {
silc_free(client->username);
SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
SilcCommandStatus status;
- SILC_LOG_DEBUG(("Start"));
-
COMMAND_CHECK_STATUS_LIST;
if (!silc_server_command_reply_identify_save(cmd))
goto out;
- /* XXX */
-
- if (status == SILC_STATUS_OK) {
-
- }
-
- if (status == SILC_STATUS_LIST_START) {
-
- }
-
- if (status == SILC_STATUS_LIST_ITEM) {
-
- }
-
- if (status == SILC_STATUS_LIST_END) {
-
- }
-
/* Execute any pending commands */
SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_IDENTIFY);
SilcCommandStatus status;
SilcChannelID *id;
SilcChannelEntry entry;
- unsigned int len;
+ unsigned int id_len, len;
unsigned char *id_string;
char *channel_name, *tmp;
unsigned int mode, created;
SilcBuffer keyp;
- SILC_LOG_DEBUG(("Start"));
-
COMMAND_CHECK_STATUS;
/* Get channel name */
goto out;
/* Get channel ID */
- id_string = silc_argument_get_arg_type(cmd->args, 3, &len);
+ id_string = silc_argument_get_arg_type(cmd->args, 3, &id_len);
if (!id_string)
goto out;
if (!tmp)
goto out;
SILC_GET32_MSB(created, tmp);
+ if (created != 0 && created != 1)
+ goto out;
/* Get channel key */
tmp = silc_argument_get_arg_type(cmd->args, 6, &len);
silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
silc_buffer_put(keyp, tmp, len);
- id = silc_id_payload_parse_id(id_string, len);
+ id = silc_id_payload_parse_id(id_string, id_len);
+ if (!id)
+ goto out;
/* See whether we already have the channel. */
entry = silc_idlist_find_channel_by_id(server->local_list, id, NULL);
silc_server_command_reply_free(cmd);
}
-SILC_SERVER_CMD_REPLY_FUNC(names)
+SILC_SERVER_CMD_REPLY_FUNC(users)
{
SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
SilcServer server = cmd->server;
SilcCommandStatus status;
-
- SILC_LOG_DEBUG(("Start"));
+ SilcChannelEntry channel;
+ SilcChannelID *channel_id = NULL;
+ SilcBuffer client_id_list;
+ SilcBuffer client_mode_list;
+ unsigned char *tmp;
+ unsigned int tmp_len;
+ unsigned int list_count, i;
COMMAND_CHECK_STATUS;
+ /* Get channel ID */
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
+ if (!tmp)
+ goto out;
+ channel_id = silc_id_payload_parse_id(tmp, tmp_len);
+ if (!channel_id)
+ goto out;
+
+ /* 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, &tmp_len);
+ if (!tmp)
+ goto out;
+
+ 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, &tmp_len);
+ if (!tmp)
+ goto out;
+
+ 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 channel entry */
+ channel = silc_idlist_find_channel_by_id(server->local_list,
+ channel_id, NULL);
+ if (!channel) {
+ channel = silc_idlist_find_channel_by_id(server->global_list,
+ channel_id, NULL);
+ if (!channel)
+ goto out;
+ }
+
+ /* 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. XXX! */
+ for (i = 0; i < list_count; i++) {
+ unsigned short idp_len;
+ unsigned int mode;
+ SilcClientID *client_id;
+ SilcClientEntry client;
+
+ /* 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;
+ 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. */
+ client = silc_idlist_find_client_by_id(server->local_list, client_id,
+ NULL);
+ if (!client)
+ client = silc_idlist_find_client_by_id(server->global_list,
+ client_id, NULL);
+ if (!client) {
+ /* If router did not find such Client ID in its lists then this must
+ be bogus client or some router in the net is buggy. */
+ if (server->server_type == SILC_ROUTER)
+ goto out;
+
+ /* We don't have that client anywhere, add it. The client is added
+ to global list since server didn't have it in the lists so it must be
+ global. */
+ client = silc_idlist_add_client(server->global_list, NULL, NULL,
+ NULL, client_id, cmd->sock->user_data,
+ NULL);
+ if (!client) {
+ silc_free(client_id);
+ continue;
+ }
+ } else {
+ /* We have the client already. */
+ silc_free(client_id);
+ }
+
+ if (!silc_server_client_on_channel(client, channel)) {
+ /* Client was not on the channel, add it. */
+ SilcChannelClientEntry chl = silc_calloc(1, sizeof(*chl));
+ chl->client = client;
+ chl->mode = mode;
+ chl->channel = channel;
+ silc_list_add(channel->user_list, chl);
+ silc_list_add(client->channels, chl);
+ }
+ }
+
+ silc_buffer_free(client_id_list);
+ silc_buffer_free(client_mode_list);
+
+ /* Execute any pending commands */
+ SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_USERS);
+
+ out:
+ if (channel_id)
+ silc_free(channel_id);
+ silc_server_command_reply_free(cmd);
}
projects / silc.git / blobdiff