they are never sent by server. More maybe added later if need appears. */
SilcServerCommandReply silc_command_reply_list[] =
{
- SILC_SERVER_CMD_REPLY(join, JOIN),
SILC_SERVER_CMD_REPLY(whois, WHOIS),
+ SILC_SERVER_CMD_REPLY(whowas, WHOWAS),
SILC_SERVER_CMD_REPLY(identify, IDENTIFY),
+ SILC_SERVER_CMD_REPLY(info, INFO),
+ SILC_SERVER_CMD_REPLY(motd, MOTD),
+ SILC_SERVER_CMD_REPLY(join, JOIN),
SILC_SERVER_CMD_REPLY(users, USERS),
{ NULL, 0 },
command reply routine receiving it. */
ctx = silc_calloc(1, sizeof(*ctx));
ctx->server = server;
- ctx->sock = sock;
+ ctx->sock = silc_socket_dup(sock);
ctx->payload = payload;
ctx->args = silc_command_get_args(ctx->payload);
ident = silc_command_get_ident(ctx->payload);
break;
if (cmd == NULL || !cmd->cb) {
- silc_free(ctx);
+ silc_server_command_reply_free(ctx);
return;
}
{
if (cmd) {
silc_command_free_payload(cmd->payload);
+ if (cmd->sock)
+ silc_socket_free(cmd->sock); /* Decrease the reference counter */
silc_free(cmd);
}
}
-/* Caches the received WHOIS information. If we are normal server currently
- we cache global information only for short period of time. */
-/* XXX cache expirying not implemented yet! */
+/* Caches the received WHOIS information. */
static char
silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd)
{
SilcServer server = cmd->server;
int len, id_len;
- unsigned char *id_data;
+ unsigned char *tmp, *id_data;
char *nickname, *username, *realname;
SilcClientID *client_id;
SilcClientEntry client;
SilcIDCacheEntry cache = NULL;
char global = FALSE;
char *nick;
+ unsigned int mode = 0;
id_data = silc_argument_get_arg_type(cmd->args, 2, &id_len);
nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
username = silc_argument_get_arg_type(cmd->args, 4, &len);
realname = silc_argument_get_arg_type(cmd->args, 5, &len);
- if (!id_data || !nickname || !username || !realname)
+ if (!id_data || !nickname || !username || !realname) {
+ SILC_LOG_ERROR(("Incomplete WHOIS info: %s %s %s",
+ nickname ? nickname : "",
+ username ? username : "",
+ realname ? realname : ""));
return FALSE;
+ }
+
+ tmp = silc_argument_get_arg_type(cmd->args, 7, &len);
+ if (tmp)
+ SILC_GET32_MSB(mode, tmp);
client_id = silc_id_payload_parse_id(id_data, id_len);
if (!client_id)
/* 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. */
- silc_idlist_add_client(server->global_list, nick,
- strdup(username),
- strdup(realname), client_id,
- cmd->sock->user_data, NULL);
+ client = silc_idlist_add_client(server->global_list, nick, strlen(nick),
+ strdup(username),
+ strdup(realname), client_id,
+ cmd->sock->user_data, NULL);
+ if (!client)
+ return FALSE;
+
+ client->data.registered = TRUE;
+ client->mode = mode;
} else {
/* We have the client already, update the data */
client->nickname = nick;
client->username = strdup(username);
client->userinfo = strdup(realname);
+ client->mode = mode;
if (cache) {
cache->data = nick;
+ cache->data_len = strlen(nick);
silc_idcache_sort_by_data(global ? server->global_list->clients :
server->local_list->clients);
}
goto out;
/* Execute any pending commands */
- SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_WHOIS);
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
+
+ out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
+ silc_server_command_reply_free(cmd);
+}
+
+/* Caches the received WHOWAS information for a short period of time. */
+
+static char
+silc_server_command_reply_whowas_save(SilcServerCommandReplyContext cmd)
+{
+ SilcServer server = cmd->server;
+ int len, id_len;
+ unsigned char *id_data;
+ char *nickname, *username, *realname;
+ SilcClientID *client_id;
+ SilcClientEntry client;
+ SilcIDCacheEntry cache = NULL;
+ char *nick;
+ int global = FALSE;
+
+ id_data = silc_argument_get_arg_type(cmd->args, 2, &id_len);
+ nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
+ username = silc_argument_get_arg_type(cmd->args, 4, &len);
+ if (!id_data || !nickname || !username)
+ return FALSE;
+
+ realname = silc_argument_get_arg_type(cmd->args, 5, &len);
+
+ client_id = silc_id_payload_parse_id(id_data, id_len);
+ if (!client_id)
+ return FALSE;
+
+ /* Check if we have this client cached already. */
+
+ client = silc_idlist_find_client_by_id(server->local_list, client_id,
+ &cache);
+ if (!client) {
+ client = silc_idlist_find_client_by_id(server->global_list,
+ client_id, &cache);
+ global = TRUE;
+ }
+
+ 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)
+ return FALSE;
+
+ /* Take hostname out of nick string if it includes it. */
+ if (strchr(nickname, '@')) {
+ int len = strcspn(nickname, "@");
+ nick = silc_calloc(len + 1, sizeof(char));
+ memcpy(nick, nickname, len);
+ } else {
+ nick = strdup(nickname);
+ }
+
+ /* 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, nick, strlen(nick),
+ strdup(username), strdup(realname),
+ silc_id_dup(client_id, SILC_ID_CLIENT),
+ cmd->sock->user_data, NULL);
+ if (!client)
+ return FALSE;
+
+ client->data.registered = FALSE;
+ client = silc_idlist_find_client_by_id(server->global_list,
+ client_id, &cache);
+ cache->expire = SILC_ID_CACHE_EXPIRE_DEF;
+ } else {
+ /* We have the client already, update the data */
+
+ /* Take hostname out of nick string if it includes it. */
+ if (strchr(nickname, '@')) {
+ int len = strcspn(nickname, "@");
+ nick = silc_calloc(len + 1, sizeof(char));
+ memcpy(nick, nickname, len);
+ } else {
+ nick = strdup(nickname);
+ }
+
+ if (client->nickname)
+ silc_free(client->nickname);
+ if (client->username)
+ silc_free(client->username);
+
+ client->nickname = nick;
+ client->username = strdup(username);
+
+ if (cache) {
+ cache->data = nick;
+ cache->data_len = strlen(nick);
+ silc_idcache_sort_by_data(global ? server->global_list->clients :
+ server->local_list->clients);
+ }
+ }
+
+ silc_free(client_id);
+
+ return TRUE;
+}
+
+/* Received reply for WHOWAS command. Cache the client information only for
+ a short period of time. */
+
+SILC_SERVER_CMD_REPLY_FUNC(whowas)
+{
+ SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
+ SilcCommandStatus status;
+
+ COMMAND_CHECK_STATUS_LIST;
+
+ if (!silc_server_command_reply_whowas_save(cmd))
+ goto out;
+
+ /* Execute any pending commands */
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_WHOWAS);
out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOWAS);
silc_server_command_reply_free(cmd);
}
/* 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. */
- silc_idlist_add_client(server->global_list, nick,
- username ? strdup(username) : NULL, NULL,
- client_id, cmd->sock->user_data, NULL);
+ client = silc_idlist_add_client(server->global_list, nick, strlen(nick),
+ username ? strdup(username) : NULL, NULL,
+ client_id, cmd->sock->user_data, NULL);
+ client->data.registered = TRUE;
} else {
/* We have the client already, update the data */
if (nickname && cache) {
cache->data = nick;
+ cache->data_len = strlen(nick);
silc_idcache_sort_by_data(global ? server->global_list->clients :
server->local_list->clients);
}
goto out;
/* Execute any pending commands */
- SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_IDENTIFY);
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY);
out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY);
+ silc_server_command_reply_free(cmd);
+}
+
+/* Received reply fro INFO command. Cache the server and its information */
+
+SILC_SERVER_CMD_REPLY_FUNC(info)
+{
+ SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
+ SilcServer server = cmd->server;
+ SilcCommandStatus status;
+ SilcServerEntry entry;
+ SilcServerID *server_id;
+ unsigned int tmp_len;
+ unsigned char *tmp, *name;
+
+ COMMAND_CHECK_STATUS;
+
+ /* Get Server ID */
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
+ if (!tmp)
+ goto out;
+ server_id = silc_id_payload_parse_id(tmp, tmp_len);
+ if (!server_id)
+ goto out;
+
+ /* Get the name */
+ name = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
+ if (tmp_len > 256)
+ goto out;
+
+ entry = silc_idlist_find_server_by_id(server->local_list, server_id, NULL);
+ if (!entry) {
+ entry = silc_idlist_find_server_by_id(server->global_list, server_id,
+ NULL);
+ if (!entry) {
+ /* Add the server to global list */
+ server_id = silc_id_dup(server_id, SILC_ID_SERVER);
+ entry = silc_idlist_add_server(server->global_list, name, 0,
+ server_id, NULL, NULL);
+ if (!entry) {
+ silc_free(server_id);
+ goto out;
+ }
+ }
+ }
+
+ /* Get the info string */
+ tmp = silc_argument_get_arg_type(cmd->args, 4, &tmp_len);
+ if (tmp_len > 256)
+ tmp = NULL;
+
+ entry->server_info = tmp ? strdup(tmp) : NULL;
+
+ /* Execute any pending commands */
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_INFO);
+
+ out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INFO);
+ silc_server_command_reply_free(cmd);
+}
+
+/* Received reply fro MOTD command. */
+
+SILC_SERVER_CMD_REPLY_FUNC(motd)
+{
+ SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
+ SilcServer server = cmd->server;
+ SilcCommandStatus status;
+ SilcServerEntry entry;
+ SilcServerID *server_id;
+ unsigned int tmp_len;
+ unsigned char *tmp;
+
+ COMMAND_CHECK_STATUS;
+
+ /* Get Server ID */
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
+ if (!tmp)
+ goto out;
+ server_id = silc_id_payload_parse_id(tmp, tmp_len);
+ if (!server_id)
+ goto out;
+
+ entry = silc_idlist_find_server_by_id(server->local_list, server_id, NULL);
+ if (!entry) {
+ entry = silc_idlist_find_server_by_id(server->global_list, server_id,
+ NULL);
+ if (!entry)
+ goto out;
+ }
+
+ /* Get the motd */
+ tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
+ if (tmp_len > 256)
+ tmp = NULL;
+
+ entry->motd = tmp;
+
+ /* Execute any pending commands */
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_MOTD);
+
+ entry->motd = NULL;
+
+ out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_MOTD);
silc_server_command_reply_free(cmd);
}
{
SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
SilcServer server = cmd->server;
+ SilcIDCacheEntry cache = NULL;
SilcCommandStatus status;
SilcChannelID *id;
+ SilcClientID *client_id = NULL;
SilcChannelEntry entry;
- unsigned int id_len, len;
+ SilcHmac hmac = NULL;
+ unsigned int id_len, len, list_count;
unsigned char *id_string;
char *channel_name, *tmp;
unsigned int mode, created;
- SilcBuffer keyp;
+ SilcBuffer keyp = NULL, client_id_list, client_mode_list;
COMMAND_CHECK_STATUS;
if (!id_string)
goto out;
+ /* Get client ID */
+ tmp = silc_argument_get_arg_type(cmd->args, 4, &len);
+ if (!tmp)
+ goto out;
+ client_id = silc_id_payload_parse_id(tmp, len);
+ if (!client_id)
+ goto out;
+
/* Get mode mask */
- tmp = silc_argument_get_arg_type(cmd->args, 4, NULL);
+ tmp = silc_argument_get_arg_type(cmd->args, 5, NULL);
if (!tmp)
goto out;
SILC_GET32_MSB(mode, tmp);
/* Get created boolean value */
- tmp = silc_argument_get_arg_type(cmd->args, 5, NULL);
+ tmp = silc_argument_get_arg_type(cmd->args, 6, NULL);
if (!tmp)
goto out;
SILC_GET32_MSB(created, tmp);
goto out;
/* Get channel key */
- tmp = silc_argument_get_arg_type(cmd->args, 6, &len);
- if (!tmp)
- goto out;
- keyp = silc_buffer_alloc(len);
- silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
- silc_buffer_put(keyp, tmp, len);
+ tmp = silc_argument_get_arg_type(cmd->args, 7, &len);
+ if (tmp) {
+ keyp = silc_buffer_alloc(len);
+ silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
+ silc_buffer_put(keyp, tmp, len);
+ }
id = silc_id_payload_parse_id(id_string, id_len);
if (!id)
goto out;
+ /* Get hmac */
+ tmp = silc_argument_get_arg_type(cmd->args, 11, NULL);
+ if (tmp) {
+ if (!silc_hmac_alloc(tmp, NULL, &hmac))
+ goto out;
+ }
+
+ /* 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);
+
/* See whether we already have the channel. */
- entry = silc_idlist_find_channel_by_id(server->local_list, id, NULL);
+ entry = silc_idlist_find_channel_by_name(server->local_list,
+ channel_name, &cache);
if (!entry) {
/* Add new channel */
/* Add the channel to our local list. */
entry = silc_idlist_add_channel(server->local_list, strdup(channel_name),
SILC_CHANNEL_MODE_NONE, id,
- server->router, NULL);
+ server->router, NULL, hmac);
if (!entry) {
silc_free(id);
goto out;
}
} else {
- silc_free(id);
+ /* The entry exists. */
+ if (entry->id)
+ silc_free(entry->id);
+ entry->id = id;
+ cache->id = entry->id;
+
+ /* Remove the founder auth data if the mode is not set but we have
+ them in the entry */
+ if (!(mode & SILC_CHANNEL_MODE_FOUNDER_AUTH) && entry->founder_key) {
+ silc_pkcs_public_key_free(entry->founder_key);
+ if (entry->founder_passwd) {
+ silc_free(entry->founder_passwd);
+ entry->founder_passwd = NULL;
+ }
+ }
+ }
+
+ if (entry->hmac_name && hmac) {
+ silc_free(entry->hmac_name);
+ entry->hmac_name = strdup(hmac->hmac->name);
+ }
+
+ /* Get the ban list */
+ tmp = silc_argument_get_arg_type(cmd->args, 8, &len);
+ if (tmp) {
+ if (entry->ban_list)
+ silc_free(entry->ban_list);
+ entry->ban_list = silc_calloc(len, sizeof(*entry->ban_list));
+ memcpy(entry->ban_list, tmp, len);
+ }
+
+ /* Get the invite list */
+ tmp = silc_argument_get_arg_type(cmd->args, 9, &len);
+ if (tmp) {
+ if (entry->invite_list)
+ silc_free(entry->invite_list);
+ entry->invite_list = silc_calloc(len, sizeof(*entry->invite_list));
+ memcpy(entry->invite_list, tmp, len);
+ }
+
+ /* Get the topic */
+ tmp = silc_argument_get_arg_type(cmd->args, 10, &len);
+ if (tmp) {
+ if (entry->topic)
+ silc_free(entry->topic);
+ entry->topic = strdup(tmp);
}
/* If channel was not created we know there is global users on the
entry->mode = mode;
/* Save channel key */
- silc_server_save_channel_key(server, keyp, entry);
- silc_buffer_free(keyp);
+ if (!(entry->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
+ silc_server_save_channel_key(server, keyp, entry);
+ }
+ if (keyp)
+ silc_buffer_free(keyp);
+
+ /* Save the users to the channel */
+ silc_server_save_users_on_channel(server, cmd->sock, entry,
+ client_id, client_id_list,
+ client_mode_list, list_count);
+
+ silc_buffer_free(client_id_list);
+ silc_buffer_free(client_mode_list);
/* Execute any pending commands */
- SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_JOIN);
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN);
+ if (client_id)
+ silc_free(client_id);
silc_server_command_reply_free(cmd);
}
SilcBuffer client_mode_list;
unsigned char *tmp;
unsigned int tmp_len;
- unsigned int list_count, i;
+ unsigned int list_count;
COMMAND_CHECK_STATUS;
if (!channel_id)
goto out;
+ /* 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;
+ }
+
/* Get the list count */
tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
if (!tmp)
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);
- }
- }
+ /* Save the users to the channel */
+ silc_server_save_users_on_channel(server, cmd->sock, channel, NULL,
+ client_id_list, client_mode_list,
+ list_count);
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);
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_USERS);
if (channel_id)
silc_free(channel_id);
silc_server_command_reply_free(cmd);
projects / silc.git / blobdiff