* received but ID entry does not exist, NULL is sent.
*/
-#include "clientlibincludes.h"
+#include "silcincludes.h"
+#include "silcclient.h"
#include "client_internal.h"
const SilcCommandStatusMessage silc_command_status_messages[] = {
{ STAT(NO_SUCH_NICK), "There was no such nickname" },
{ STAT(NO_SUCH_CHANNEL), "There was no such channel" },
- { STAT(NO_SUCH_SERVER), "No such server" },
+ { STAT(NO_SUCH_SERVER), "There was no such server" },
{ STAT(TOO_MANY_TARGETS), "Duplicate recipients. No message delivered" },
{ STAT(NO_RECIPIENT), "No recipient given" },
{ STAT(UNKNOWN_COMMAND), "Unknown command" },
Usage: COMMAND_REPLY((ARGS, argument1, argument2, etc...)), */
#define COMMAND_REPLY(args) cmd->client->internal->ops->command_reply args
#define ARGS cmd->client, cmd->sock->user_data, \
- cmd->payload, TRUE, silc_command_get(cmd->payload), status
+ cmd->payload, TRUE, silc_command_get(cmd->payload), cmd->status
/* Error reply to application. Usage: COMMAND_REPLY_ERROR; */
#define COMMAND_REPLY_ERROR cmd->client->internal->ops-> \
command_reply(cmd->client, cmd->sock->user_data, cmd->payload, \
- FALSE, silc_command_get(cmd->payload), status)
+ FALSE, silc_command_get(cmd->payload), cmd->status)
#define SAY cmd->client->internal->ops->say
/* All functions that call the COMMAND_CHECK_STATUS or the
COMMAND_CHECK_STATUS_LIST macros must have out: goto label. */
-#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) { \
- COMMAND_REPLY_ERROR; \
- goto out; \
- } \
+#define COMMAND_CHECK_STATUS \
+do { \
+ SILC_LOG_DEBUG(("Start")); \
+ if (cmd->status != SILC_STATUS_OK) { \
+ COMMAND_REPLY_ERROR; \
+ goto out; \
+ } \
} while(0)
-#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 && \
- status != SILC_STATUS_LIST_ITEM && \
- status != SILC_STATUS_LIST_END) { \
- COMMAND_REPLY_ERROR; \
- goto out; \
- } \
+#define COMMAND_CHECK_STATUS_LIST \
+do { \
+ SILC_LOG_DEBUG(("Start")); \
+ if (cmd->status != SILC_STATUS_OK && \
+ cmd->status != SILC_STATUS_LIST_START && \
+ cmd->status != SILC_STATUS_LIST_ITEM && \
+ cmd->status != SILC_STATUS_LIST_END) { \
+ COMMAND_REPLY_ERROR; \
+ goto out; \
+ } \
} while(0)
/* Process received command reply. */
ctx->client = client;
ctx->sock = sock;
ctx->payload = payload;
+ ctx->status = silc_command_get_status(ctx->payload);
ctx->args = silc_command_get_args(ctx->payload);
ctx->packet = packet;
ctx->ident = silc_command_get_ident(ctx->payload);
{
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcClientID *client_id;
- SilcIDCacheEntry id_cache = NULL;
SilcClientEntry client_entry = NULL;
int argc;
- uint32 len;
+ SilcUInt32 len;
unsigned char *id_data, *tmp;
char *nickname = NULL, *username = NULL;
char *realname = NULL;
- uint32 idle = 0, mode = 0;
+ SilcUInt32 idle = 0, mode = 0;
SilcBuffer channels = NULL;
unsigned char *fingerprint;
- uint32 fingerprint_len;
+ SilcUInt32 fingerprint_len;
argc = silc_argument_get_arg_num(cmd->args);
return;
}
- client_id = silc_id_payload_parse_id(id_data, len);
+ client_id = silc_id_payload_parse_id(id_data, len, NULL);
if (!client_id) {
if (notify)
COMMAND_REPLY_ERROR;
fingerprint = silc_argument_get_arg_type(cmd->args, 9, &fingerprint_len);
/* Check if we have this client cached already. */
- if (!silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)client_id,
- NULL, NULL,
- silc_hash_client_id_compare, NULL,
- &id_cache)) {
+ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id);
+ if (!client_entry) {
SILC_LOG_DEBUG(("Adding new client entry"));
client_entry =
silc_client_add_client(cmd->client, conn, nickname, username, realname,
client_id, mode);
} else {
- client_entry = (SilcClientEntry)id_cache->context;
silc_client_update_client(cmd->client, conn, client_entry,
nickname, username, realname, mode);
silc_free(client_id);
}
if (fingerprint && !client_entry->fingerprint) {
- client_entry->fingerprint =
- silc_calloc(fingerprint_len,
- sizeof(*client_entry->fingerprint));
- memcpy(client_entry->fingerprint, fingerprint, fingerprint_len);
+ client_entry->fingerprint = silc_memdup(fingerprint, fingerprint_len);
client_entry->fingerprint_len = fingerprint_len;
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
COMMAND_CHECK_STATUS_LIST;
/* Save WHOIS info */
- silc_client_command_reply_whois_save(cmd, status, TRUE);
+ silc_client_command_reply_whois_save(cmd, cmd->status, TRUE);
/* Pending callbacks are not executed if this was an list entry */
- if (status != SILC_STATUS_OK &&
- status != SILC_STATUS_LIST_END) {
+ if (cmd->status != SILC_STATUS_OK &&
+ cmd->status != SILC_STATUS_LIST_END) {
silc_client_command_reply_free(cmd);
return;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
/* If we received notify for invalid ID we'll remove the ID if we
have it cached. */
- if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) {
+ if (cmd->status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) {
SilcClientEntry client_entry;
- uint32 tmp_len;
+ SilcUInt32 tmp_len;
unsigned char *tmp =
silc_argument_get_arg_type(silc_command_get_args(cmd->payload),
2, &tmp_len);
if (tmp) {
- SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (client_id) {
client_entry = silc_client_get_client_by_id(cmd->client, conn,
client_id);
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
SilcClientID *client_id;
- SilcIDCacheEntry id_cache = NULL;
SilcClientEntry client_entry = NULL;
- uint32 len;
+ SilcUInt32 len;
unsigned char *id_data;
char *nickname, *username;
char *realname = NULL;
goto out;
}
- client_id = silc_id_payload_parse_id(id_data, len);
+ client_id = silc_id_payload_parse_id(id_data, len, NULL);
if (!client_id) {
COMMAND_REPLY_ERROR;
goto out;
}
/* Get the client entry, if exists */
- if (silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)client_id,
- NULL, NULL,
- silc_hash_client_id_compare, NULL,
- &id_cache))
- client_entry = (SilcClientEntry)id_cache->context;
+ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id);
silc_free(client_id);
nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
COMMAND_REPLY((ARGS, client_entry, nickname, username, realname));
/* Pending callbacks are not executed if this was an list entry */
- if (status != SILC_STATUS_OK &&
- status != SILC_STATUS_LIST_END) {
+ if (cmd->status != SILC_STATUS_OK &&
+ cmd->status != SILC_STATUS_LIST_END) {
silc_client_command_reply_free(cmd);
return;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOWAS);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOWAS);
silc_client_command_reply_free(cmd);
}
SilcClientID *client_id = NULL;
SilcServerID *server_id = NULL;
SilcChannelID *channel_id = NULL;
- SilcIDCacheEntry id_cache = NULL;
SilcClientEntry client_entry;
SilcServerEntry server_entry;
SilcChannelEntry channel_entry;
int argc;
- uint32 len;
+ SilcUInt32 len;
unsigned char *id_data;
char *name = NULL, *info = NULL;
SilcIDPayload idp = NULL;
SILC_LOG_DEBUG(("Received client information"));
/* Check if we have this client cached already. */
- if (!silc_idcache_find_by_id_one_ext(conn->client_cache,
- (void *)client_id,
- NULL, NULL,
- silc_hash_client_id_compare, NULL,
- &id_cache)) {
+ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id);
+ if (!client_entry) {
SILC_LOG_DEBUG(("Adding new client entry"));
client_entry =
silc_client_add_client(cmd->client, conn, name, info, NULL,
silc_id_dup(client_id, id_type), 0);
} else {
- client_entry = (SilcClientEntry)id_cache->context;
silc_client_update_client(cmd->client, conn, client_entry,
name, info, NULL, 0);
}
SILC_LOG_DEBUG(("Received server information"));
/* Check if we have this server cached already. */
- if (!silc_idcache_find_by_id_one(conn->server_cache,
- (void *)server_id, &id_cache)) {
+ server_entry = silc_client_get_server_by_id(cmd->client, conn, server_id);
+ if (!server_entry) {
SILC_LOG_DEBUG(("Adding new server entry"));
-
- server_entry = silc_calloc(1, sizeof(*server_entry));
- server_entry->server_id = silc_id_dup(server_id, id_type);
- if (name)
- server_entry->server_name = strdup(name);
- if (info)
- server_entry->server_info = strdup(info);
-
- /* Add server to cache */
- silc_idcache_add(conn->server_cache, server_entry->server_name,
- server_entry->server_id, (void *)server_entry,
- 0, NULL);
- } else {
- server_entry = (SilcServerEntry)id_cache->context;
+ server_entry = silc_client_add_server(cmd->client, conn, name, info,
+ silc_id_dup(server_id, id_type));
+ if (!server_entry) {
+ if (notify)
+ COMMAND_REPLY_ERROR;
+ return;
+ }
}
/* Notify application */
SILC_LOG_DEBUG(("Received channel information"));
/* Check if we have this channel cached already. */
- if (!silc_idcache_find_by_id_one(conn->channel_cache,
- (void *)channel_id, &id_cache)) {
+ channel_entry = silc_client_get_channel_by_id(client, conn, channel_id);
+ if (!channel_entry) {
if (!name)
break;
- SILC_LOG_DEBUG(("Adding new channel entry"));
- channel_entry = silc_client_new_channel_id(client, conn->sock,
- strdup(name), 0, idp);
- } else {
- channel_entry = (SilcChannelEntry)id_cache->context;
+ /* Add new channel entry */
+ channel_entry = silc_client_add_channel(client, conn, name, 0,
+ channel_id);
+ channel_id = NULL;
}
/* Notify application */
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
COMMAND_CHECK_STATUS_LIST;
/* Save IDENTIFY info */
- silc_client_command_reply_identify_save(cmd, status, TRUE);
+ silc_client_command_reply_identify_save(cmd, cmd->status, TRUE);
/* Pending callbacks are not executed if this was an list entry */
- if (status != SILC_STATUS_OK &&
- status != SILC_STATUS_LIST_END) {
+ if (cmd->status != SILC_STATUS_OK &&
+ cmd->status != SILC_STATUS_LIST_END) {
silc_client_command_reply_free(cmd);
return;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY);
/* If we received notify for invalid ID we'll remove the ID if we
have it cached. */
- if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) {
+ if (cmd->status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) {
SilcClientEntry client_entry;
- uint32 tmp_len;
+ SilcUInt32 tmp_len;
unsigned char *tmp =
silc_argument_get_arg_type(silc_command_get_args(cmd->payload),
2, &tmp_len);
if (tmp) {
- SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (client_id) {
client_entry = silc_client_get_client_by_id(cmd->client, conn,
client_id);
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
SilcIDPayload idp;
unsigned char *tmp;
- uint32 argc, len;
+ SilcUInt32 argc, len;
SILC_LOG_DEBUG(("Start"));
- SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "Cannot set nickname: %s", silc_client_command_status_message(status));
+ "Cannot set nickname: %s",
+ silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
/* Notify application */
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK);
COMMAND_REPLY((ARGS, conn->local_entry));
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_NICK);
silc_client_command_reply_free(cmd);
return;
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_NICK);
silc_client_command_reply_free(cmd);
}
SILC_CLIENT_CMD_REPLY_FUNC(list)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
- SilcCommandStatus status;
unsigned char *tmp, *name, *topic;
- uint32 usercount = 0;
+ SilcUInt32 usercount = 0;
COMMAND_CHECK_STATUS_LIST;
COMMAND_REPLY((ARGS, NULL, name, topic, usercount));
/* Pending callbacks are not executed if this was an list entry */
- if (status != SILC_STATUS_OK &&
- status != SILC_STATUS_LIST_END) {
+ if (cmd->status != SILC_STATUS_OK &&
+ cmd->status != SILC_STATUS_LIST_END) {
silc_client_command_reply_free(cmd);
return;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LIST);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_LIST);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
SilcChannelEntry channel;
SilcChannelID *channel_id = NULL;
- SilcIDCacheEntry id_cache = NULL;
unsigned char *tmp;
char *topic;
- uint32 argc, len;
+ SilcUInt32 argc, len;
- SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
if (!topic)
goto out;
- channel_id = silc_id_payload_parse_id(tmp, len);
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
if (!channel_id)
goto out;
/* Get the channel entry */
- if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- &id_cache)) {
+ channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id);
+ if (!channel) {
silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
}
- channel = (SilcChannelEntry)id_cache->context;
-
/* Notify application */
COMMAND_REPLY((ARGS, channel, topic));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_TOPIC);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
SilcChannelEntry channel;
SilcChannelID *channel_id;
- SilcIDCacheEntry id_cache;
unsigned char *tmp;
- uint32 len;
+ SilcUInt32 len;
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
if (!tmp)
goto out;
- channel_id = silc_id_payload_parse_id(tmp, len);
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
if (!channel_id)
goto out;
/* Get the channel entry */
- if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- &id_cache)) {
+ channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id);
+ if (!channel) {
silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
}
-
- channel = (SilcChannelEntry)id_cache->context;
/* Get the invite list */
tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INVITE);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INVITE);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KILL);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
unsigned char *tmp;
- SilcIDCacheEntry id_cache;
SilcServerEntry server;
SilcServerID *server_id = NULL;
char *server_name, *server_info;
- uint32 len;
+ SilcUInt32 len;
SILC_LOG_DEBUG(("Start"));
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s",
- silc_client_command_status_message(status));
+ silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
if (!tmp)
goto out;
- server_id = silc_id_payload_parse_id(tmp, len);
+ server_id = silc_id_payload_parse_id(tmp, len, NULL);
if (!server_id)
goto out;
goto out;
/* See whether we have this server cached. If not create it. */
- if (!silc_idcache_find_by_id_one(conn->server_cache, (void *)server_id,
- &id_cache)) {
+ server = silc_client_get_server_by_id(cmd->client, conn, server_id);
+ if (!server) {
SILC_LOG_DEBUG(("New server entry"));
-
- server = silc_calloc(1, sizeof(*server));
- server->server_name = strdup(server_name);
- server->server_info = strdup(server_info);
- server->server_id = silc_id_dup(server_id, SILC_ID_SERVER);
-
- /* Add it to the cache */
- silc_idcache_add(conn->server_cache, server->server_name,
- server->server_id, (void *)server, 0, NULL);
- } else {
- server = (SilcServerEntry)id_cache->context;
+ server = silc_client_add_server(cmd->client, conn, server_name,
+ server_info,
+ silc_id_dup(server_id, SILC_ID_SERVER));
+ if (!server)
+ goto out;
}
-
+
/* Notify application */
COMMAND_REPLY((ARGS, server, server->server_name, server->server_info));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INFO);
silc_free(server_id);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
void *id;
int i;
time_t diff, curtime;
- SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_PING);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- SilcIDPayload idp = NULL;
SilcChannelEntry channel;
- SilcIDCacheEntry id_cache = NULL;
SilcChannelUser chu;
- uint32 argc, mode, len, list_count;
+ SilcChannelID *channel_id;
+ SilcUInt32 argc, mode = 0, len, list_count;
char *topic, *tmp, *channel_name = NULL, *hmac;
SilcBuffer keyp = NULL, client_id_list = NULL, client_mode_list = NULL;
int i;
SILC_LOG_DEBUG(("Start"));
- SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
- if (status != SILC_STATUS_OK) {
- if (status != SILC_STATUS_ERR_USER_ON_CHANNEL)
+ if (cmd->status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_ERR_USER_ON_CHANNEL)
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
COMMAND_REPLY_ERROR;
goto out;
}
- channel_name = strdup(tmp);
+ channel_name = tmp;
/* Get Channel ID */
tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"Cannot join channel: Bad reply packet");
COMMAND_REPLY_ERROR;
- silc_free(channel_name);
goto out;
}
- idp = silc_id_payload_parse(tmp, len);
- if (!idp) {
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
+ if (!channel_id) {
COMMAND_REPLY_ERROR;
- silc_free(channel_name);
goto out;
}
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, 7, &len);
/* Get topic */
topic = silc_argument_get_arg_type(cmd->args, 10, NULL);
- /* If we have the channel entry, remove it and create a new one */
+ /* Check whether we have this channel entry already. */
channel = silc_client_get_channel(cmd->client, conn, channel_name);
- if (channel)
- silc_client_del_channel(cmd->client, conn, channel);
-
- /* Save received Channel ID. This actually creates the channel */
- channel = silc_client_new_channel_id(cmd->client, cmd->sock, channel_name,
- mode, idp);
- silc_id_payload_free(idp);
+ if (channel) {
+ if (!SILC_ID_CHANNEL_COMPARE(channel->id, channel_id))
+ silc_client_replace_channel_id(cmd->client, conn, channel, channel_id);
+ } else {
+ /* Create new channel entry */
+ channel = silc_client_add_channel(cmd->client, conn, channel_name,
+ mode, channel_id);
+ }
conn->current_channel = channel;
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"Cannot join channel: Unsupported HMAC `%s'", hmac);
COMMAND_REPLY_ERROR;
- silc_free(channel_name);
goto out;
}
}
/* Add clients we received in the reply to the channel */
for (i = 0; i < list_count; i++) {
- uint16 idp_len;
- uint32 mode;
+ SilcUInt16 idp_len;
+ SilcUInt32 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);
+ client_id = silc_id_payload_parse_id(client_id_list->data, idp_len, NULL);
if (!client_id)
continue;
SILC_GET32_MSB(mode, client_mode_list->data);
/* Check if we have this client cached already. */
- if (!silc_idcache_find_by_id_one_ext(conn->client_cache,
- (void *)client_id,
- NULL, NULL,
- silc_hash_client_id_compare, NULL,
- &id_cache)) {
+ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id);
+ if (!client_entry) {
/* No, we don't have it, add entry for it. */
client_entry =
silc_client_add_client(cmd->client, conn, NULL, NULL, NULL,
silc_id_dup(client_id, SILC_ID_CLIENT), 0);
- } 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);
+ /* Join client to the channel */
+ if (!silc_client_on_channel(channel, client_entry)) {
+ chu = silc_calloc(1, sizeof(*chu));
+ chu->client = client_entry;
+ chu->channel = channel;
+ chu->mode = mode;
+ silc_hash_table_add(channel->user_list, client_entry, chu);
+ silc_hash_table_add(client_entry->channels, channel, chu);
+ }
+ silc_free(client_id);
silc_buffer_pull(client_id_list, idp_len);
silc_buffer_pull(client_mode_list, 4);
}
client_mode_list->head);
/* Save channel key */
- if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY))
- silc_client_save_channel_key(conn, keyp, channel);
-
- /* Client is now joined to the channel */
- channel->on_channel = TRUE;
+ if (keyp && !(channel->mode & SILC_CHANNEL_MODE_PRIVKEY))
+ silc_client_save_channel_key(cmd->client, conn, keyp, channel);
/* Notify application */
COMMAND_REPLY((ARGS, channel_name, channel, mode, 0,
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN);
silc_client_command_reply_free(cmd);
if (keyp)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- uint32 argc, i;
- unsigned char *tmp;
+ SilcUInt32 argc, i;
char *motd = NULL, *cp, line[256];
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
return;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_MOTD);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
unsigned char *tmp;
- uint32 mode;
+ SilcUInt32 mode;
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_UMODE);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
unsigned char *tmp;
- uint32 mode;
- SilcIDCacheEntry id_cache;
+ SilcUInt32 mode;
SilcChannelID *channel_id;
SilcChannelEntry channel;
- uint32 len;
+ SilcUInt32 len;
- SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
if (!tmp)
goto out;
- channel_id = silc_id_payload_parse_id(tmp, len);
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
if (!channel_id)
goto out;
/* Get the channel entry */
- if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- &id_cache)) {
+ channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id);
+ if (!channel) {
silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
}
- channel = (SilcChannelEntry)id_cache->context;
-
/* Get channel mode */
tmp = silc_argument_get_arg_type(cmd->args, 3, NULL);
if (!tmp) {
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CMODE);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CMODE);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- SilcIDCacheEntry id_cache = NULL;
SilcClientID *client_id;
SilcChannelID *channel_id;
SilcClientEntry client_entry;
SilcChannelEntry channel;
SilcChannelUser chu;
unsigned char *modev, *tmp, *id;
- uint32 len, mode;
+ SilcUInt32 len, mode;
- SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
if (!tmp)
goto out;
- channel_id = silc_id_payload_parse_id(tmp, len);
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
if (!channel_id)
goto out;
/* Get the channel entry */
- if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- &id_cache)) {
+ channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id);
+ if (!channel) {
silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
}
- channel = (SilcChannelEntry)id_cache->context;
-
/* Get Client ID */
id = silc_argument_get_arg_type(cmd->args, 4, &len);
if (!id) {
COMMAND_REPLY_ERROR;
goto out;
}
- client_id = silc_id_payload_parse_id(id, len);
+ client_id = silc_id_payload_parse_id(id, len, NULL);
if (!client_id) {
silc_free(channel_id);
COMMAND_REPLY_ERROR;
}
/* Get client entry */
- if (!silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)client_id,
- NULL, NULL,
- silc_hash_client_id_compare, NULL,
- &id_cache)) {
+ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id);
+ if (!client_entry) {
silc_free(channel_id);
silc_free(client_id);
COMMAND_REPLY_ERROR;
goto out;
}
- client_entry = (SilcClientEntry)id_cache->context;
-
/* Save the mode */
SILC_GET32_MSB(mode, modev);
- silc_list_start(channel->clients);
- while ((chu = silc_list_get(channel->clients)) != SILC_LIST_END) {
- if (chu->client == client_entry) {
- chu->mode = mode;
- break;
- }
- }
+ chu = silc_client_on_channel(channel, client_entry);
+ if (chu)
+ chu->mode = mode;
/* Notify application */
COMMAND_REPLY((ARGS, mode, channel, client_entry));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CUMODE);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CUMODE);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- 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 (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KICK);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- 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 (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SILCOPER);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- 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 (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_OPER);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- 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 (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CONNECT);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CONNECT);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- SilcIDCacheEntry id_cache = NULL;
SilcChannelEntry channel;
SilcChannelID *channel_id;
unsigned char *tmp;
- uint32 len;
+ SilcUInt32 len;
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
if (!tmp)
goto out;
- channel_id = silc_id_payload_parse_id(tmp, len);
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
if (!channel_id)
goto out;
/* Get the channel entry */
- if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- &id_cache)) {
+ channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id);
+ if (!channel) {
silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
}
- channel = (SilcChannelEntry)id_cache->context;
-
/* Get the ban list */
tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_BAN);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_BAN);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- 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 (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CLOSE);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CLOSE);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- 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 (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SHUTDOWN);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SHUTDOWN);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- 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 (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_LEAVE);
silc_client_command_reply_free(cmd);
}
+/* Channel resolving callback for USERS command reply. */
+
+static void silc_client_command_reply_users_cb(SilcClient client,
+ SilcClientConnection conn,
+ SilcChannelEntry *channels,
+ SilcUInt32 channels_count,
+ void *context)
+{
+ if (!channels_count) {
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcCommandStatus status = SILC_STATUS_ERR_NO_SUCH_CHANNEL;
+
+ SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "%s", silc_client_command_status_message(status));
+ COMMAND_REPLY_ERROR;
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
+ silc_client_command_reply_free(cmd);
+ return;
+ }
+
+ silc_client_command_reply_users(context, NULL);
+}
+
/* Reply to USERS command. Received list of client ID's and theirs modes
on the channel we requested. */
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- SilcIDCacheEntry id_cache = NULL;
SilcChannelEntry channel;
+ SilcClientEntry client_entry;
SilcChannelUser chu;
SilcChannelID *channel_id = NULL;
SilcBuffer client_id_list = NULL;
SilcBuffer client_mode_list = NULL;
unsigned char *tmp;
- uint32 tmp_len, list_count;
+ SilcUInt32 tmp_len, list_count;
int i;
unsigned char **res_argv = NULL;
- uint32 *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0;
+ SilcUInt32 *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0;
SILC_LOG_DEBUG(("Start"));
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
COMMAND_REPLY_ERROR;
goto out;
}
- channel_id = silc_id_payload_parse_id(tmp, tmp_len);
+ channel_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!channel_id) {
COMMAND_REPLY_ERROR;
goto out;
silc_buffer_put(client_mode_list, tmp, tmp_len);
/* Get channel entry */
- if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- &id_cache)) {
+ channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id);
+ if (!channel) {
/* Resolve the channel from server */
- silc_idlist_get_channel_by_id(cmd->client, conn, channel_id, TRUE);
-
- /* 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_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident,
- NULL, silc_client_command_reply_users, cmd);
+ silc_client_get_channel_by_id_resolve(cmd->client, conn, channel_id,
+ silc_client_command_reply_users_cb,
+ cmd);
+ silc_free(channel_id);
+ if (client_id_list)
+ silc_buffer_free(client_id_list);
+ if (client_mode_list)
+ silc_buffer_free(client_mode_list);
return;
- } else {
- channel = (SilcChannelEntry)id_cache->context;
- }
-
- /* 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);
}
/* Cache the received Client ID's and modes. */
for (i = 0; i < list_count; i++) {
- uint16 idp_len;
- uint32 mode;
+ SilcUInt16 idp_len;
+ SilcUInt32 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);
+ client_id = silc_id_payload_parse_id(client_id_list->data, idp_len, NULL);
if (!client_id)
continue;
SILC_GET32_MSB(mode, client_mode_list->data);
/* Check if we have this client cached already. */
- id_cache = NULL;
- silc_idcache_find_by_id_one_ext(conn->client_cache,
- (void *)client_id,
- NULL, NULL,
- silc_hash_client_id_compare, NULL,
- &id_cache);
-
- if (!id_cache || !((SilcClientEntry)id_cache->context)->username ||
- !((SilcClientEntry)id_cache->context)->realname) {
-
- if (id_cache && id_cache->context) {
- SilcClientEntry client_entry = (SilcClientEntry)id_cache->context;
+ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id);
+ if (!client_entry || !client_entry->username || !client_entry->realname) {
+ if (client_entry) {
if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) {
silc_buffer_pull(client_id_list, idp_len);
silc_buffer_pull(client_mode_list, 4);
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);
- id_cache = NULL;
+ if (!silc_client_on_channel(channel, client_entry)) {
+ chu = silc_calloc(1, sizeof(*chu));
+ chu->client = client_entry;
+ chu->mode = mode;
+ chu->channel = channel;
+ silc_hash_table_add(channel->user_list, client_entry, chu);
+ silc_hash_table_add(client_entry->channels, channel, chu);
+ }
}
+ silc_free(client_id);
silc_buffer_pull(client_id_list, idp_len);
silc_buffer_pull(client_mode_list, 4);
}
command reply we will reprocess this command reply by re-calling this
USERS command reply callback. */
silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
- NULL, silc_client_command_reply_users, cmd);
+ silc_client_command_reply_users, cmd);
silc_buffer_free(res_cmd);
- if (channel_id)
- silc_free(channel_id);
-
+ silc_free(channel_id);
silc_free(res_argv);
silc_free(res_argv_lens);
silc_free(res_argv_types);
+ if (client_id_list)
+ silc_buffer_free(client_id_list);
+ if (client_mode_list)
+ silc_buffer_free(client_mode_list);
return;
}
+
+ 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));
/* Notify application */
COMMAND_REPLY((ARGS, channel, list_count, client_id_list, client_mode_list));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_USERS);
silc_client_command_reply_free(cmd);
silc_free(channel_id);
if (client_id_list)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- SilcIDCacheEntry id_cache;
SilcIDPayload idp = NULL;
SilcClientID *client_id = NULL;
SilcClientEntry client_entry;
SilcServerEntry server_entry;
SilcSKEPKType type;
unsigned char *tmp, *pk;
- uint32 len;
- uint16 pk_len;
+ SilcUInt32 len;
+ SilcUInt16 pk_len;
SilcIdType id_type;
SilcPublicKey public_key = NULL;
SILC_LOG_DEBUG(("Start"));
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->status != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->status));
COMMAND_REPLY_ERROR;
goto out;
}
SILC_GET16_MSB(type, tmp + 2);
pk = tmp + 4;
- if (type != SILC_SKE_PK_TYPE_SILC) {
- COMMAND_REPLY_ERROR;
- goto out;
- }
-
- if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key)) {
- COMMAND_REPLY_ERROR;
- goto out;
- }
+ if (type == SILC_SKE_PK_TYPE_SILC)
+ if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key))
+ public_key = NULL;
}
id_type = silc_id_payload_get_type(idp);
if (id_type == SILC_ID_CLIENT) {
/* Received client's public key */
client_id = silc_id_payload_get_id(idp);
- if (!silc_idcache_find_by_id_one_ext(conn->client_cache,
- (void *)client_id,
- NULL, NULL,
- silc_hash_client_id_compare, NULL,
- &id_cache)) {
+ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id);
+ if (!client_entry) {
COMMAND_REPLY_ERROR;
goto out;
}
- client_entry = (SilcClientEntry)id_cache->context;
-
/* Notify application */
COMMAND_REPLY((ARGS, id_type, client_entry, public_key));
} else if (id_type == SILC_ID_SERVER) {
/* Received server's public key */
server_id = silc_id_payload_get_id(idp);
- if (!silc_idcache_find_by_id_one(conn->server_cache, (void *)server_id,
- &id_cache)) {
+ server_entry = silc_client_get_server_by_id(cmd->client, conn, server_id);
+ if (!server_entry) {
COMMAND_REPLY_ERROR;
goto out;
}
- server_entry = (SilcServerEntry)id_cache->context;
-
/* Notify application */
COMMAND_REPLY((ARGS, id_type, server_entry, public_key));
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_GETKEY);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_GETKEY);
if (idp)
silc_id_payload_free(idp);
if (public_key)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
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 &&
- status != SILC_STATUS_LIST_ITEM &&
- status != SILC_STATUS_LIST_END)
+ if (cmd->status != SILC_STATUS_OK &&
+ cmd->status != SILC_STATUS_LIST_START &&
+ cmd->status != SILC_STATUS_LIST_ITEM &&
+ cmd->status != SILC_STATUS_LIST_END)
goto out;
/* Save WHOIS info */
- silc_client_command_reply_whois_save(cmd, status, FALSE);
+ silc_client_command_reply_whois_save(cmd, cmd->status, FALSE);
/* Pending callbacks are not executed if this was an list entry */
- if (status != SILC_STATUS_OK &&
- status != SILC_STATUS_LIST_END) {
+ if (cmd->status != SILC_STATUS_OK &&
+ cmd->status != SILC_STATUS_LIST_END) {
silc_client_command_reply_free(cmd);
return;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
/* If we received notify for invalid ID we'll remove the ID if we
have it cached. */
- if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) {
+ if (cmd->status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) {
SilcClientEntry client_entry;
- uint32 tmp_len;
+ SilcUInt32 tmp_len;
unsigned char *tmp =
silc_argument_get_arg_type(silc_command_get_args(cmd->payload),
2, &tmp_len);
if (tmp) {
- SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (client_id) {
client_entry = silc_client_get_client_by_id(cmd->client, conn,
client_id);
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
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 &&
- status != SILC_STATUS_LIST_ITEM &&
- status != SILC_STATUS_LIST_END)
+ if (cmd->status != SILC_STATUS_OK &&
+ cmd->status != SILC_STATUS_LIST_START &&
+ cmd->status != SILC_STATUS_LIST_ITEM &&
+ cmd->status != SILC_STATUS_LIST_END)
goto out;
/* Save IDENTIFY info */
- silc_client_command_reply_identify_save(cmd, status, FALSE);
+ silc_client_command_reply_identify_save(cmd, cmd->status, FALSE);
/* Pending callbacks are not executed if this was an list entry */
- if (status != SILC_STATUS_OK &&
- status != SILC_STATUS_LIST_END) {
+ if (cmd->status != SILC_STATUS_OK &&
+ cmd->status != SILC_STATUS_LIST_END) {
silc_client_command_reply_free(cmd);
return;
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY);
/* If we received notify for invalid ID we'll remove the ID if we
have it cached. */
- if (status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) {
+ if (cmd->status == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) {
SilcClientEntry client_entry;
- uint32 tmp_len;
+ SilcUInt32 tmp_len;
unsigned char *tmp =
silc_argument_get_arg_type(silc_command_get_args(cmd->payload),
2, &tmp_len);
if (tmp) {
- SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ SilcClientID *client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (client_id) {
client_entry = silc_client_get_client_by_id(cmd->client, conn,
client_id);
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
unsigned char *tmp;
- SilcIDCacheEntry id_cache;
SilcServerEntry server;
SilcServerID *server_id = NULL;
char *server_name, *server_info;
- uint32 len;
+ SilcUInt32 len;
SILC_LOG_DEBUG(("Start"));
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK)
+ if (cmd->status != SILC_STATUS_OK)
goto out;
/* Get server ID */
if (!tmp)
goto out;
- server_id = silc_id_payload_parse_id(tmp, len);
+ server_id = silc_id_payload_parse_id(tmp, len, NULL);
if (!server_id)
goto out;
goto out;
/* See whether we have this server cached. If not create it. */
- if (!silc_idcache_find_by_id_one(conn->server_cache, (void *)server_id,
- &id_cache)) {
+ server = silc_client_get_server_by_id(cmd->client, conn, server_id);
+ if (!server) {
SILC_LOG_DEBUG(("New server entry"));
- server = silc_calloc(1, sizeof(*server));
- server->server_name = strdup(server_name);
- server->server_info = strdup(server_info);
- server->server_id = silc_id_dup(server_id, SILC_ID_SERVER);
-
- /* Add it to the cache */
- silc_idcache_add(conn->server_cache, server->server_name,
- server->server_id, (void *)server, 0, NULL);
+ silc_client_add_server(cmd->client, conn, server_name, server_info,
+ silc_id_dup(server_id, SILC_ID_SERVER));
}
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INFO);
silc_free(server_id);
silc_client_command_reply_free(cmd);
}