{ 0, NULL }
};
-/* Command reply operation that is called at the end of all command replys.
- 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
-
-/* 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)
#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; \
- } \
-} while(0)
+/* All functions that call the COMMAND_CHECK_STATUS macro must have
+ out: goto label. */
-#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 \
+do { \
+ SILC_LOG_DEBUG(("Start")); \
+ if (!silc_command_get_status(cmd->payload, NULL, NULL)) { \
+ COMMAND_REPLY_ERROR; \
+ goto out; \
+ } \
} while(0)
/* Process received command reply. */
ctx->args = silc_command_get_args(ctx->payload);
ctx->packet = packet;
ctx->ident = silc_command_get_ident(ctx->payload);
+ silc_command_get_status(ctx->payload, &ctx->status, &ctx->error);
/* Check for pending commands and mark to be exeucted */
silc_client_command_pending_check(sock->user_data, ctx,
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcClientID *client_id;
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;
- SilcBuffer channels = NULL;
+ SilcUInt32 idle = 0, mode = 0;
+ SilcBufferStruct channels;
unsigned char *fingerprint;
- uint32 fingerprint_len;
+ SilcUInt32 fingerprint_len;
- argc = silc_argument_get_arg_num(cmd->args);
-
id_data = silc_argument_get_arg_type(cmd->args, 2, &len);
if (!id_data) {
if (notify)
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;
}
tmp = silc_argument_get_arg_type(cmd->args, 6, &len);
- if (tmp) {
- channels = silc_buffer_alloc(len);
- silc_buffer_pull_tail(channels, SILC_BUFFER_END(channels));
- silc_buffer_put(channels, tmp, len);
- }
+ if (tmp)
+ silc_buffer_set(&channels, tmp, len);
tmp = silc_argument_get_arg_type(cmd->args, 7, &len);
if (tmp)
/* Notify application */
if (!cmd->callback && notify)
COMMAND_REPLY((ARGS, client_entry, nickname, username, realname,
- channels, mode, idle, fingerprint));
-
- if (channels)
- silc_buffer_free(channels);
+ &channels, mode, idle, fingerprint));
}
/* Received reply for WHOIS command. This maybe called several times
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- COMMAND_CHECK_STATUS_LIST;
+ COMMAND_CHECK_STATUS;
/* 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;
}
/* 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->error == 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;
SilcClientEntry client_entry = NULL;
- uint32 len;
+ SilcUInt32 len;
unsigned char *id_data;
char *nickname, *username;
char *realname = NULL;
- COMMAND_CHECK_STATUS_LIST;
+ COMMAND_CHECK_STATUS;
id_data = silc_argument_get_arg_type(cmd->args, 2, &len);
if (!id_data) {
goto out;
}
- client_id = silc_id_payload_parse_id(id_data, len);
+ client_id = silc_id_payload_parse_id(id_data, len, NULL);
if (!client_id) {
COMMAND_REPLY_ERROR;
goto out;
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;
}
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;
SilcIdType id_type;
- argc = silc_argument_get_arg_num(cmd->args);
-
id_data = silc_argument_get_arg_type(cmd->args, 2, &len);
if (!id_data) {
if (notify)
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 */
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- COMMAND_CHECK_STATUS_LIST;
+ COMMAND_CHECK_STATUS;
/* 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;
}
/* 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->error == 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->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
SILC_CLIENT_CMD_REPLY_FUNC(list)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
- SilcCommandStatus status;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
unsigned char *tmp, *name, *topic;
- uint32 usercount = 0;
+ SilcUInt32 usercount = 0, len;
+ SilcChannelID *channel_id = NULL;
+ SilcChannelEntry channel_entry;
+
+ COMMAND_CHECK_STATUS;
+
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
+ if (!tmp) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
- COMMAND_CHECK_STATUS_LIST;
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
+ if (!channel_id) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
name = silc_argument_get_arg_type(cmd->args, 3, NULL);
+ if (!name) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
topic = silc_argument_get_arg_type(cmd->args, 4, NULL);
tmp = silc_argument_get_arg_type(cmd->args, 5, NULL);
if (tmp)
SILC_GET32_MSB(usercount, tmp);
+ /* Check whether the channel exists, and add it to cache if it doesn't. */
+ channel_entry = silc_client_get_channel_by_id(cmd->client, conn,
+ channel_id);
+ if (!channel_entry) {
+ /* Add new channel entry */
+ channel_entry = silc_client_add_channel(cmd->client, conn, name, 0,
+ channel_id);
+ if (!channel_entry) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+ channel_id = NULL;
+ }
+
/* Notify application */
- COMMAND_REPLY((ARGS, NULL, name, topic, usercount));
+ COMMAND_REPLY((ARGS, channel_entry, 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_free(channel_id);
SILC_CLIENT_PENDING_EXEC(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;
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->error != 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->error));
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;
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
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->error != 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->error));
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;
{
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->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
{
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->error != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "%s",
- silc_client_command_status_message(status));
+ silc_client_command_status_message(cmd->error));
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));
{
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->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
SilcChannelEntry channel;
SilcChannelUser chu;
SilcChannelID *channel_id;
- uint32 argc, mode = 0, len, list_count;
+ 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->error != SILC_STATUS_OK) {
+ if (cmd->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
COMMAND_REPLY_ERROR;
goto out;
}
- channel_id = silc_id_payload_parse_id(tmp, len);
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
if (!channel_id) {
COMMAND_REPLY_ERROR;
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;
}
/* Join client to the channel */
- 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);
+ 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);
{
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->error != 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->error));
COMMAND_REPLY_ERROR;
return;
}
{
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->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
unsigned char *tmp;
- uint32 mode;
+ 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->error != 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->error));
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;
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
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->error != 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->error));
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;
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;
{
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->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
{
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->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
{
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->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
silc_client_command_reply_free(cmd);
}
-SILC_CLIENT_CMD_REPLY_FUNC(connect)
+SILC_CLIENT_CMD_REPLY_FUNC(detach)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- unsigned char *tmp;
+ SilcBuffer detach;
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
/* Notify application */
COMMAND_REPLY((ARGS));
+ /* Generate the detachment data and deliver it to the client in the
+ detach client operation */
+ detach = silc_client_get_detach_data(cmd->client, conn);
+ if (detach) {
+ cmd->client->internal->ops->detach(cmd->client, conn,
+ detach->data, detach->len);
+ silc_buffer_free(detach);
+ }
+
out:
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CONNECT);
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_DETACH);
silc_client_command_reply_free(cmd);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
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->error != 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->error));
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;
silc_client_command_reply_free(cmd);
}
-SILC_CLIENT_CMD_REPLY_FUNC(close)
-{
- 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) {
- SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
- COMMAND_REPLY_ERROR;
- goto out;
- }
-
- /* Notify application */
- COMMAND_REPLY((ARGS));
+/* Reply to LEAVE command. */
- out:
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CLOSE);
- silc_client_command_reply_free(cmd);
-}
-
-SILC_CLIENT_CMD_REPLY_FUNC(shutdown)
+SILC_CLIENT_CMD_REPLY_FUNC(leave)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
+ SilcChannelID *channel_id;
+ SilcChannelEntry channel = NULL;
unsigned char *tmp;
+ SilcUInt32 len;
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
+ if (cmd->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
- /* Notify application */
- COMMAND_REPLY((ARGS));
-
- out:
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SHUTDOWN);
- silc_client_command_reply_free(cmd);
-}
-
-/* Reply to LEAVE command. */
+ /* From protocol version 1.1 we get the channel ID of the left channel */
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
+ if (tmp) {
+ channel_id = silc_id_payload_parse_id(tmp, len, NULL);
+ if (!channel_id)
+ goto out;
-SILC_CLIENT_CMD_REPLY_FUNC(leave)
-{
- SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
- SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
- unsigned char *tmp;
+ /* Get the channel entry */
+ channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id);
+ if (!channel) {
+ silc_free(channel_id);
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- if (status != SILC_STATUS_OK) {
- SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
- COMMAND_REPLY_ERROR;
- goto out;
+ silc_free(channel_id);
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((ARGS, channel));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE);
static void silc_client_command_reply_users_cb(SilcClient client,
SilcClientConnection conn,
SilcChannelEntry *channels,
- uint32 channels_count,
+ 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;
+ cmd->status = cmd->error = SILC_STATUS_ERR_NO_SUCH_CHANNEL;
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
+ "%s", silc_client_command_status_message(cmd->error));
COMMAND_REPLY_ERROR;
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
silc_client_command_reply_free(cmd);
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. */
-
-SILC_CLIENT_CMD_REPLY_FUNC(users)
+static int
+silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd,
+ SilcCommandStatus status,
+ bool notify,
+ SilcGetChannelCallback get_channel,
+ SilcCommandCb get_clients)
{
- SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcCommandStatus status;
SilcChannelEntry channel;
SilcClientEntry client_entry;
SilcChannelUser chu;
SilcChannelID *channel_id = NULL;
- SilcBuffer client_id_list = NULL;
- SilcBuffer client_mode_list = NULL;
+ SilcBufferStruct client_id_list, client_mode_list;
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) {
- SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
- "%s", silc_client_command_status_message(status));
- COMMAND_REPLY_ERROR;
- goto out;
- }
-
/* Get channel ID */
tmp = silc_argument_get_arg_type(cmd->args, 2, &tmp_len);
if (!tmp) {
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;
COMMAND_REPLY_ERROR;
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);
+ silc_buffer_set(&client_id_list, tmp, tmp_len);
/* Get client mode list */
tmp = silc_argument_get_arg_type(cmd->args, 5, &tmp_len);
COMMAND_REPLY_ERROR;
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);
+ silc_buffer_set(&client_mode_list, tmp, tmp_len);
/* Get channel entry */
channel = silc_client_get_channel_by_id(cmd->client, conn, channel_id);
if (!channel) {
/* Resolve the channel from server */
silc_client_get_channel_by_id_resolve(cmd->client, conn, channel_id,
- silc_client_command_reply_users_cb,
- cmd);
+ get_channel, 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;
+ return 1;
}
/* 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;
/* Client ID */
- SILC_GET16_MSB(idp_len, client_id_list->data + 2);
+ 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;
/* Mode */
- SILC_GET32_MSB(mode, client_mode_list->data);
+ SILC_GET32_MSB(mode, client_mode_list.data);
/* Check if we have this client cached already. */
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);
+ silc_buffer_pull(&client_id_list, idp_len);
+ silc_buffer_pull(&client_mode_list, 4);
continue;
}
client_entry->status |= SILC_CLIENT_STATUS_RESOLVING;
(res_argc + 1));
res_argv_types = silc_realloc(res_argv_types, sizeof(*res_argv_types) *
(res_argc + 1));
- res_argv[res_argc] = client_id_list->data;
+ res_argv[res_argc] = client_id_list.data;
res_argv_lens[res_argc] = idp_len;
res_argv_types[res_argc] = res_argc + 3;
res_argc++;
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);
+ silc_buffer_pull(&client_id_list, idp_len);
+ silc_buffer_pull(&client_mode_list, 4);
}
/* Query the client information from server if the list included clients
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,
- silc_client_command_reply_users, cmd);
+ get_clients, cmd);
silc_buffer_free(res_cmd);
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;
+ return 1;
}
- 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));
+ 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));
+ if (notify)
+ COMMAND_REPLY((ARGS, channel, list_count, &client_id_list,
+ &client_mode_list));
+
+ out:
+ silc_free(channel_id);
+ return 0;
+}
+
+/* Reply to USERS command. Received list of client ID's and theirs modes
+ on the channel we requested. */
+
+SILC_CLIENT_CMD_REPLY_FUNC(users)
+{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+
+ SILC_LOG_DEBUG(("Start"));
+
+ if (cmd->error != SILC_STATUS_OK) {
+ SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "%s", silc_client_command_status_message(cmd->error));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ if (silc_client_command_reply_users_save(cmd, cmd->status, TRUE,
+ silc_client_command_reply_users_cb,
+ silc_client_command_reply_users))
+ return;
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
silc_client_command_reply_free(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);
}
/* Received command reply to GETKEY command. WE've received the remote
{
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->error != 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->error));
COMMAND_REPLY_ERROR;
goto out;
}
} 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));
}
{
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->error != SILC_STATUS_OK)
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;
}
/* 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->error == 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->error != SILC_STATUS_OK)
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;
}
/* 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->error == 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->error != 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_free(server_id);
silc_client_command_reply_free(cmd);
}
+
+static void silc_client_command_reply_users_i_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;
+
+ cmd->status = cmd->error = SILC_STATUS_ERR_NO_SUCH_CHANNEL;
+ SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "%s", silc_client_command_status_message(cmd->error));
+ COMMAND_REPLY_ERROR;
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
+ silc_client_command_reply_free(cmd);
+ return;
+ }
+
+ silc_client_command_reply_users_i(context, NULL);
+}
+
+SILC_CLIENT_CMD_REPLY_FUNC(users_i)
+{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+
+ SILC_LOG_DEBUG(("Start"));
+
+ if (cmd->error != SILC_STATUS_OK)
+ goto out;
+
+ /* Save USERS info */
+ if (silc_client_command_reply_users_save(
+ cmd, cmd->status, FALSE,
+ silc_client_command_reply_users_i_cb,
+ silc_client_command_reply_users_i))
+ return;
+
+ out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
+
+ /* Unregister this command reply */
+ silc_client_command_unregister(cmd->client, SILC_COMMAND_USERS,
+ NULL, silc_client_command_reply_users_i,
+ cmd->ident);
+
+ silc_client_command_reply_free(cmd);
+}
+
+/* Private range commands, specific to this implementation (and compatible
+ with SILC Server >= 0.9). */
+
+SILC_CLIENT_CMD_REPLY_FUNC(connect)
+{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+
+ if (cmd->error != SILC_STATUS_OK) {
+ SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "%s", silc_client_command_status_message(cmd->error));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS));
+
+ out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CONNECT);
+ silc_client_command_reply_free(cmd);
+}
+
+SILC_CLIENT_CMD_REPLY_FUNC(close)
+{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+
+ if (cmd->error != SILC_STATUS_OK) {
+ SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "%s", silc_client_command_status_message(cmd->error));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS));
+
+ out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CLOSE);
+ silc_client_command_reply_free(cmd);
+}
+
+SILC_CLIENT_CMD_REPLY_FUNC(shutdown)
+{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+
+ if (cmd->error != SILC_STATUS_OK) {
+ SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "%s", silc_client_command_status_message(cmd->error));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS));
+
+ out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_SHUTDOWN);
+ silc_client_command_reply_free(cmd);
+}
projects / silc.git / blobdiff