Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2002 Pekka Riikonen
+ Copyright (C) 1997 - 2003 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; version 2 of the License.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
SILC_SERVER_CMD_REPLY(users, USERS),
SILC_SERVER_CMD_REPLY(getkey, GETKEY),
SILC_SERVER_CMD_REPLY(list, LIST),
+ SILC_SERVER_CMD_REPLY(watch, WATCH),
+ SILC_SERVER_CMD_REPLY(ping, PING),
{ NULL, 0 },
};
SILC_LOG_DEBUG(("Bad command reply packet"));
return;
}
-
+
/* Allocate command reply context. This must be free'd by the
command reply routine receiving it. */
ctx = silc_calloc(1, sizeof(*ctx));
ctx->payload = payload;
ctx->args = silc_command_get_args(ctx->payload);
ctx->ident = silc_command_get_ident(ctx->payload);
-
+ command = silc_command_get(ctx->payload);
+
+ /* Client is not allowed to send reply to all commands */
+ if (sock->type == SILC_SOCKET_TYPE_CLIENT &&
+ command != SILC_COMMAND_WHOIS) {
+ silc_server_command_reply_free(ctx);
+ return;
+ }
+
/* Check for pending commands and mark to be exeucted */
- ctx->callbacks =
- silc_server_command_pending_check(server, silc_command_get(ctx->payload),
+ ctx->callbacks =
+ silc_server_command_pending_check(server, command,
ctx->ident, &ctx->callbacks_count);
/* Execute command reply */
- command = silc_command_get(ctx->payload);
for (cmd = silc_command_reply_list; cmd->cb; cmd++)
if (cmd->cmd == command)
break;
}
}
-static void
+static void
silc_server_command_process_error(SilcServerCommandReplyContext cmd,
SilcStatus error)
{
if (client_id) {
SILC_LOG_DEBUG(("Received invalid client ID notification, deleting "
"the entry from cache"));
- client = silc_idlist_find_client_by_id(server->global_list,
+ client = silc_idlist_find_client_by_id(server->global_list,
client_id, FALSE, NULL);
if (client) {
- silc_server_remove_from_channels(server, NULL, client, TRUE,
- NULL, TRUE);
+ silc_server_remove_from_channels(server, NULL, client, TRUE,
+ NULL, TRUE, FALSE);
silc_idlist_del_data(client);
silc_idlist_del_client(server->global_list, client);
}
/* Check if we have this client cached already. */
- client = silc_idlist_find_client_by_id(server->local_list, client_id,
+ client = silc_idlist_find_client_by_id(server->local_list, client_id,
FALSE, NULL);
if (!client) {
- client = silc_idlist_find_client_by_id(server->global_list, client_id,
+ client = silc_idlist_find_client_by_id(server->global_list, client_id,
FALSE, NULL);
global = TRUE;
}
silc_parse_userfqdn(nickname, &nick, &servername);
/* 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
+ 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,
- strdup(username),
- strdup(realname), client_id,
+ client = silc_idlist_add_client(server->global_list, nick,
+ strdup(username),
+ strdup(realname), client_id,
cmd->sock->user_data, NULL, 0);
if (!client) {
SILC_LOG_ERROR(("Could not add new client to the ID Cache"));
return FALSE;
}
- client->data.status |=
+ client->data.status |=
(SILC_IDLIST_STATUS_REGISTERED | SILC_IDLIST_STATUS_RESOLVED);
client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
client->mode = mode;
silc_free(client->username);
silc_free(client->userinfo);
silc_free(client->servername);
-
+
client->nickname = nick;
client->username = strdup(username);
client->userinfo = strdup(realname);
/* Create new cache entry */
silc_idcache_add(global ? server->global_list->clients :
- server->local_list->clients, nick, client->id,
- client, 0, NULL);
+ server->local_list->clients, nick, client->id,
+ client, 0, NULL);
silc_free(client_id);
}
if (fingerprint && flen == sizeof(client->data.fingerprint))
memcpy(client->data.fingerprint, fingerprint, flen);
+ /* Take Requested Attributes if set. */
+ tmp = silc_argument_get_arg_type(cmd->args, 11, &len);
+ if (tmp) {
+ silc_free(client->attrs);
+ client->attrs = silc_memdup(tmp, len);
+ client->attrs_len = len;
+ }
+
+ return TRUE;
+}
+
+/* Handle requested attributes reply in WHOIS from client */
+
+static char
+silc_server_command_reply_whois_save_client(SilcServerCommandReplyContext cmd)
+{
+ unsigned char *tmp;
+ SilcUInt32 len;
+ SilcClientEntry client = cmd->sock->user_data;
+
+ /* Take Requested Attributes if set. */
+ tmp = silc_argument_get_arg_type(cmd->args, 11, &len);
+ if (tmp && client) {
+ silc_free(client->attrs);
+ client->attrs = silc_memdup(tmp, len);
+ client->attrs_len = len;
+ }
+
+ client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
+
return TRUE;
}
COMMAND_CHECK_STATUS;
- if (!silc_server_command_reply_whois_save(cmd))
- goto out;
+ if (cmd->sock->type != SILC_SOCKET_TYPE_CLIENT) {
+ if (!silc_server_command_reply_whois_save(cmd))
+ goto out;
+ } else {
+ if (!silc_server_command_reply_whois_save_client(cmd))
+ goto out;
+ }
/* Pending callbacks are not executed if this was an list entry */
if (status != SILC_STATUS_OK &&
client = silc_idlist_find_client_by_id(server->local_list, client_id,
FALSE, &cache);
if (!client) {
- client = silc_idlist_find_client_by_id(server->global_list,
+ client = silc_idlist_find_client_by_id(server->global_list,
client_id, FALSE, &cache);
global = TRUE;
}
silc_parse_userfqdn(nickname, &nick, &servername);
/* 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
+ 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,
- strdup(username), strdup(realname),
- silc_id_dup(client_id, SILC_ID_CLIENT),
+ strdup(username), strdup(realname),
+ silc_id_dup(client_id, SILC_ID_CLIENT),
cmd->sock->user_data, NULL,
SILC_ID_CACHE_EXPIRE_DEF);
if (!client) {
return FALSE;
}
- client->data.status &= ~SILC_IDLIST_STATUS_REGISTERED;
+ client->data.status |= SILC_IDLIST_STATUS_RESOLVED;
+ client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
+ client->data.status &= ~SILC_IDLIST_STATUS_REGISTERED;
client->servername = servername;
} else {
/* We have the client already, update the data */
silc_free(client->nickname);
silc_free(client->username);
-
+ silc_free(client->servername);
+
client->nickname = nick;
client->username = strdup(username);
client->servername = servername;
+ client->data.status |= SILC_IDLIST_STATUS_RESOLVED;
+ client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
/* Remove the old cache entry and create a new one */
silc_idcache_del_by_context(global ? server->global_list->clients :
server->local_list->clients, client);
silc_idcache_add(global ? server->global_list->clients :
- server->local_list->clients, nick, client->id,
+ server->local_list->clients, nick, client->id,
client, 0, NULL);
}
}
out:
+ silc_server_command_process_error(cmd, error);
SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_WHOWAS);
+ silc_server_command_reply_free(cmd);
+ return;
+
err:
+ silc_server_command_process_error(cmd, error);
silc_server_command_reply_free(cmd);
}
SILC_LOG_DEBUG(("Received client information"));
- client = silc_idlist_find_client_by_id(server->local_list,
+ client = silc_idlist_find_client_by_id(server->local_list,
client_id, FALSE, NULL);
if (!client) {
client = silc_idlist_find_client_by_id(server->global_list, client_id,
silc_parse_userfqdn(name, &nick, NULL);
/* 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
+ 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,
+ client = silc_idlist_add_client(server->global_list, nick,
info ? strdup(info) : NULL, NULL,
client_id, cmd->sock->user_data,
NULL, time(NULL) + 300);
client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
} else {
/* We have the client already, update the data */
-
+
SILC_LOG_DEBUG(("Updating client data"));
-
+
/* Take nickname */
if (name) {
silc_parse_userfqdn(name, &nick, NULL);
silc_free(client->nickname);
client->nickname = nick;
}
-
+
if (info) {
silc_free(client->username);
client->username = strdup(info);
client->data.status |= SILC_IDLIST_STATUS_RESOLVED;
client->data.status &= ~SILC_IDLIST_STATUS_RESOLVING;
-
+
if (name) {
/* Add new cache entry */
silc_idcache_add(global ? server->global_list->clients :
- server->local_list->clients, nick, client->id,
+ server->local_list->clients, nick, client->id,
client, expire, NULL);
}
SILC_LOG_DEBUG(("Received server information"));
- server_entry = silc_idlist_find_server_by_id(server->local_list,
+ server_entry = silc_idlist_find_server_by_id(server->local_list,
server_id, FALSE, NULL);
if (!server_entry)
- server_entry = silc_idlist_find_server_by_id(server->global_list,
+ server_entry = silc_idlist_find_server_by_id(server->global_list,
server_id, FALSE, NULL);
if (!server_entry) {
/* If router did not find such Server ID in its lists then this must
be bogus server or some router in the net is buggy. */
if (server->server_type != SILC_SERVER)
goto error;
-
+
/* We don't have that server anywhere, add it. */
- server_entry = silc_idlist_add_server(server->global_list,
+ server_entry = silc_idlist_add_server(server->global_list,
strdup(name), 0,
server_id, server->router,
SILC_PRIMARY_ROUTE(server));
SILC_LOG_DEBUG(("Received channel information"));
- channel = silc_idlist_find_channel_by_name(server->local_list,
+ channel = silc_idlist_find_channel_by_name(server->local_list,
name, NULL);
if (!channel)
- channel = silc_idlist_find_channel_by_name(server->global_list,
+ channel = silc_idlist_find_channel_by_name(server->global_list,
name, NULL);
if (!channel) {
/* If router did not find such Channel ID in its lists then this must
be bogus channel or some router in the net is buggy. */
if (server->server_type != SILC_SERVER)
goto error;
-
+
/* We don't have that channel anywhere, add it. */
channel = silc_idlist_add_channel(server->global_list, strdup(name),
- SILC_CHANNEL_MODE_NONE, channel_id,
+ SILC_CHANNEL_MODE_NONE, channel_id,
server->router, NULL, NULL, 0);
if (!channel) {
silc_free(channel_id);
if (tmp_len > 256)
goto out;
- entry = silc_idlist_find_server_by_id(server->local_list, server_id,
+ entry = silc_idlist_find_server_by_id(server->local_list, server_id,
FALSE, NULL);
if (!entry) {
- entry = silc_idlist_find_server_by_id(server->global_list, server_id,
+ entry = silc_idlist_find_server_by_id(server->global_list, server_id,
FALSE, NULL);
if (!entry) {
/* Add the server to global list */
if (!server_id)
goto out;
- entry = silc_idlist_find_server_by_id(server->local_list, server_id,
+ entry = silc_idlist_find_server_by_id(server->local_list, server_id,
TRUE, NULL);
if (!entry) {
- entry = silc_idlist_find_server_by_id(server->global_list, server_id,
+ entry = silc_idlist_find_server_by_id(server->global_list, server_id,
TRUE, NULL);
if (!entry)
goto out;
/* Get founder key */
tmp = silc_argument_get_arg_type(cmd->args, 15, &len);
if (tmp)
- silc_pkcs_public_key_decode(tmp, len, &founder_key);
+ silc_pkcs_public_key_payload_decode(tmp, len, &founder_key);
/* See whether we already have the channel. */
- entry = silc_idlist_find_channel_by_name(server->local_list,
+ entry = silc_idlist_find_channel_by_name(server->local_list,
channel_name, &cache);
if (!entry) {
/* Add new channel */
- SILC_LOG_DEBUG(("Adding new [%s] channel %s id(%s)",
+ SILC_LOG_DEBUG(("Adding new [%s] channel %s id(%s)",
(created == 0 ? "existing" : "created"), channel_name,
silc_id_render(id, SILC_ID_CHANNEL)));
silc_free(id);
goto out;
}
+ hmac = NULL;
server->stat.my_channels++;
server->stat.channels++;
} else {
founder_key = NULL;
}
- if (entry->hmac_name && hmac) {
+ if (entry->hmac_name && (hmac || (!hmac && entry->hmac))) {
silc_free(entry->hmac_name);
- entry->hmac_name = strdup(silc_hmac_get_name(hmac));
+ entry->hmac_name = strdup(silc_hmac_get_name(hmac ? hmac : entry->hmac));
}
/* Get the ban list */
tmp = silc_argument_get_arg_type(cmd->args, 8, &len);
- if (tmp) {
- silc_free(entry->ban_list);
- entry->ban_list = silc_memdup(tmp, len);
+ if (tmp && len > 2) {
+ SilcArgumentPayload iargs;
+ SilcUInt16 iargc;
+ SILC_GET16_MSB(iargc, tmp);
+ iargs = silc_argument_payload_parse(tmp + 2, len - 2, iargc);
+ if (iargs) {
+ /* Delete old ban list */
+ if (entry->ban_list)
+ silc_hash_table_free(entry->ban_list);
+ entry->ban_list =
+ silc_hash_table_alloc(0, silc_hash_ptr,
+ NULL, NULL, NULL,
+ silc_server_inviteban_destruct, entry, TRUE);
+
+ /* Add new ban list */
+ silc_server_inviteban_process(server, entry->ban_list, 0, iargs);
+ silc_argument_payload_free(iargs);
+ }
}
/* Get the invite list */
tmp = silc_argument_get_arg_type(cmd->args, 9, &len);
- if (tmp) {
- silc_free(entry->invite_list);
- entry->invite_list = silc_memdup(tmp, len);
+ if (tmp && len > 2) {
+ SilcArgumentPayload iargs;
+ SilcUInt16 iargc;
+ SILC_GET16_MSB(iargc, tmp);
+ iargs = silc_argument_payload_parse(tmp + 2, len - 2, iargc);
+ if (iargs) {
+ /* Delete old invite list */
+ if (entry->invite_list)
+ silc_hash_table_free(entry->invite_list);
+ entry->invite_list =
+ silc_hash_table_alloc(0, silc_hash_ptr,
+ NULL, NULL, NULL,
+ silc_server_inviteban_destruct, entry, TRUE);
+
+ /* Add new invite list */
+ silc_server_inviteban_process(server, entry->invite_list, 0, iargs);
+ silc_argument_payload_free(iargs);
+ }
}
/* Get the topic */
entry->topic = strdup(tmp);
}
- /* If channel was not created we know there is global users on the
+ /* Get channel public key list */
+ tmp = silc_argument_get_arg_type(cmd->args, 16, &len);
+ if (tmp && server->server_type == SILC_SERVER)
+ silc_server_set_channel_pk_list(server, NULL, entry, tmp, len);
+
+ /* If channel was not created we know there is global users on the
channel. */
entry->global_users = (created == 0 ? TRUE : FALSE);
}
/* Save the users to the channel */
- silc_server_save_users_on_channel(server, cmd->sock, entry,
+ silc_server_save_users_on_channel(server, cmd->sock, entry,
client_id, client_id_list,
client_mode_list, list_count);
entry->users_resolved = TRUE;
out:
SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
err:
+ if (hmac)
+ silc_hmac_free(hmac);
silc_free(client_id);
silc_server_command_reply_free(cmd);
/* Get statistics structure */
tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
- if (server->server_type == SILC_SERVER && tmp) {
+ if (server->server_type != SILC_ROUTER && tmp) {
silc_buffer_set(&buf, tmp, tmp_len);
silc_buffer_unformat(&buf,
SILC_STR_UI_INT(NULL),
goto out;
/* Get channel entry */
- channel = silc_idlist_find_channel_by_id(server->local_list,
+ 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 = silc_idlist_find_channel_by_id(server->global_list,
channel_id, NULL);
if (!channel) {
SilcBuffer idp;
/* Register pending command callback. After we've received the channel
information we will reprocess this command reply by re-calling this
USERS command reply callback. */
- silc_server_command_pending(server, SILC_COMMAND_IDENTIFY,
+ silc_server_command_pending(server, SILC_COMMAND_IDENTIFY,
server->cmd_ident,
silc_server_command_reply_users, cmd);
return;
/* Save the users to the channel */
silc_server_save_users_on_channel(server, cmd->sock, channel, NULL,
- client_id_list, client_mode_list,
+ client_id_list, client_mode_list,
list_count);
channel->global_users = silc_server_channel_has_global(channel);
SilcServerEntry server_entry = NULL;
SilcClientID *client_id = NULL;
SilcServerID *server_id = NULL;
- SilcSKEPKType type;
- unsigned char *tmp, *pk;
+ unsigned char *tmp;
SilcUInt32 len;
- SilcUInt16 pk_len;
SilcIDPayload idp = NULL;
SilcIdType id_type;
SilcPublicKey public_key = NULL;
if (!tmp)
goto out;
- /* Decode the public key */
-
- SILC_GET16_MSB(pk_len, tmp);
- SILC_GET16_MSB(type, tmp + 2);
- pk = tmp + 4;
-
- if (type != SILC_SKE_PK_TYPE_SILC)
- goto out;
-
- if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key))
+ /* Decode the public key payload */
+ if (!silc_pkcs_public_key_payload_decode(tmp, len, &public_key))
goto out;
id_type = silc_id_payload_get_type(idp);
client = silc_idlist_find_client_by_id(server->local_list, client_id,
TRUE, NULL);
if (!client) {
- client = silc_idlist_find_client_by_id(server->global_list,
+ client = silc_idlist_find_client_by_id(server->global_list,
client_id, TRUE, NULL);
if (!client)
goto out;
server_entry = silc_idlist_find_server_by_id(server->local_list, server_id,
TRUE, NULL);
if (!server_entry) {
- server_entry = silc_idlist_find_server_by_id(server->global_list,
+ server_entry = silc_idlist_find_server_by_id(server->global_list,
server_id, TRUE, NULL);
if (!server_entry)
goto out;
SILC_GET32_MSB(usercount, tmp);
/* Add the channel entry if we do not have it already */
- channel = silc_idlist_find_channel_by_name(server->local_list,
+ channel = silc_idlist_find_channel_by_name(server->local_list,
name, &cache);
if (!channel) {
- channel = silc_idlist_find_channel_by_name(server->global_list,
+ channel = silc_idlist_find_channel_by_name(server->global_list,
name, &cache);
global_list = TRUE;
}
be bogus channel or some router in the net is buggy. */
if (server->server_type != SILC_SERVER)
goto out;
-
+
channel = silc_idlist_add_channel(server->global_list, strdup(name),
- SILC_CHANNEL_MODE_NONE, channel_id,
- server->router, NULL, NULL,
+ SILC_CHANNEL_MODE_NONE, channel_id,
+ server->router, NULL, NULL,
time(NULL) + 60);
if (!channel)
goto out;
err:
silc_server_command_reply_free(cmd);
}
+
+SILC_SERVER_CMD_REPLY_FUNC(ping)
+{
+ SilcServerCommandReplyContext cmd = (SilcServerCommandReplyContext)context;
+ SilcStatus status, error;
+
+ COMMAND_CHECK_STATUS;
+
+ out:
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_PING);
+ err:
+ silc_server_command_reply_free(cmd);
+}