SILC_CLIENT_CMD_REPLY(cmode, CMODE),
SILC_CLIENT_CMD_REPLY(cumode, CUMODE),
SILC_CLIENT_CMD_REPLY(kick, KICK),
- SILC_CLIENT_CMD_REPLY(restart, RESTART),
+ SILC_CLIENT_CMD_REPLY(ban, BAN),
SILC_CLIENT_CMD_REPLY(close, CLOSE),
SILC_CLIENT_CMD_REPLY(shutdown, SHUTDOWN),
SILC_CLIENT_CMD_REPLY(silcoper, SILCOPER),
SILC_CLIENT_CMD_REPLY(leave, LEAVE),
SILC_CLIENT_CMD_REPLY(users, USERS),
+ SILC_CLIENT_CMD_REPLY(getkey, GETKEY),
{ NULL, 0 },
};
{ STAT(NO_SERVER_ID), "No Server ID given" },
{ STAT(BAD_CLIENT_ID), "Bad Client ID" },
{ STAT(BAD_CHANNEL_ID), "Bad Channel ID" },
- { STAT(NO_SUCH_CLIENT_ID), "No such Client ID" },
- { STAT(NO_SUCH_CHANNEL_ID),"No such Channel ID" },
+ { STAT(NO_SUCH_CLIENT_ID), "There is no such client" },
+ { STAT(NO_SUCH_CHANNEL_ID),"There is no such channel" },
{ STAT(NICKNAME_IN_USE), "Nickname already exists" },
{ STAT(NOT_ON_CHANNEL), "You are not on that channel" },
{ STAT(USER_NOT_ON_CHANNEL),"They are not on the channel" },
{ STAT(BAD_CHANNEL), "Bad channel name" },
{ STAT(AUTH_FAILED), "Authentication failed" },
{ STAT(UNKNOWN_ALGORITHM), "Unsupported algorithm" },
+ { STAT(NO_SUCH_SERVER_ID), "No such Server ID" },
{ 0, NULL }
};
cmd->sock->user_data, cmd->payload, FALSE, \
silc_command_get(cmd->payload), status)
+/* 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)
+
+#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; \
+ } \
+} while(0)
+
/* Process received command reply. */
void silc_client_command_reply_process(SilcClient client,
SilcClientCommandReplyContext ctx;
SilcCommandPayload payload;
SilcCommand command;
- unsigned short ident;
+ uint16 ident;
/* Get command reply payload from packet */
payload = silc_command_payload_parse(buffer);
return;
}
- cmd->cb(ctx);
+ cmd->cb(ctx, NULL);
}
/* Returns status message string */
void silc_client_command_reply_free(SilcClientCommandReplyContext cmd)
{
if (cmd) {
- silc_command_free_payload(cmd->payload);
+ silc_command_payload_free(cmd->payload);
silc_free(cmd);
}
}
SilcClientID *client_id;
SilcIDCacheEntry id_cache = NULL;
SilcClientEntry client_entry = NULL;
- int argc, len;
+ int argc;
+ uint32 len;
unsigned char *id_data, *tmp;
char *nickname = NULL, *username = NULL;
char *realname = NULL;
- unsigned int idle = 0, mode = 0;
+ uint32 idle = 0, mode = 0;
SilcBuffer channels = NULL;
argc = silc_argument_get_arg_num(cmd->args);
SILC_GET32_MSB(idle, tmp);
/* Check if we have this client cached already. */
- if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
- SILC_ID_CLIENT, &id_cache)) {
+ if (!silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)client_id,
+ NULL, NULL,
+ silc_hash_client_id_compare, NULL,
+ &id_cache)) {
SILC_LOG_DEBUG(("Adding new client entry"));
-
- client_entry = silc_calloc(1, sizeof(*client_entry));
- client_entry->id = client_id;
- silc_parse_nickname(nickname, &client_entry->nickname,
- &client_entry->server, &client_entry->num);
- client_entry->username = strdup(username);
- if (realname)
- client_entry->realname = strdup(realname);
- client_entry->mode = mode;
-
- /* Add client to cache */
- silc_idcache_add(conn->client_cache, client_entry->nickname,
- strlen(client_entry->nickname),
- SILC_ID_CLIENT, client_id, (void *)client_entry,
- TRUE, FALSE);
+ client_entry =
+ silc_client_add_client(cmd->client, conn, nickname, username, realname,
+ client_id, mode);
} else {
client_entry = (SilcClientEntry)id_cache->context;
- if (client_entry->nickname)
- silc_free(client_entry->nickname);
- if (client_entry->server)
- silc_free(client_entry->server);
- if (client_entry->username)
- silc_free(client_entry->username);
- if (client_entry->realname)
- silc_free(client_entry->realname);
- client_entry->mode = mode;
-
- SILC_LOG_DEBUG(("Updating client entry"));
-
- silc_parse_nickname(nickname, &client_entry->nickname,
- &client_entry->server, &client_entry->num);
- client_entry->username = strdup(username);
- if (realname)
- client_entry->realname = strdup(realname);
-
- id_cache->data = client_entry->nickname;
- id_cache->data_len = strlen(client_entry->nickname);
- silc_idcache_sort_by_data(conn->client_cache);
-
+ silc_client_update_client(cmd->client, conn, client_entry,
+ nickname, username, realname, mode);
silc_free(client_id);
}
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcCommandStatus status;
- unsigned char *tmp;
-
- SILC_LOG_DEBUG(("Start"));
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- 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;
- }
+ COMMAND_CHECK_STATUS_LIST;
- /* Display one whois reply */
- if (status == SILC_STATUS_OK)
- silc_client_command_reply_whois_save(cmd, status);
-
- /* List */
- if (status == SILC_STATUS_LIST_START ||
- status == SILC_STATUS_LIST_ITEM ||
- status == SILC_STATUS_LIST_END)
- silc_client_command_reply_whois_save(cmd, status);
+ /* Save WHOIS info */
+ silc_client_command_reply_whois_save(cmd, status);
/* Pending callbacks are not executed if this was an list entry */
if (status != SILC_STATUS_OK &&
return;
}
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
silc_client_command_reply_free(cmd);
}
SilcClientID *client_id;
SilcIDCacheEntry id_cache = NULL;
SilcClientEntry client_entry = NULL;
- unsigned int len;
- unsigned char *id_data, *tmp;
+ uint32 len;
+ unsigned char *id_data;
char *nickname, *username;
char *realname = NULL;
- SILC_LOG_DEBUG(("Start"));
+ COMMAND_CHECK_STATUS_LIST;
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- 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;
- }
-
id_data = silc_argument_get_arg_type(cmd->args, 2, &len);
if (!id_data) {
COMMAND_REPLY_ERROR;
- return;
+ goto out;
}
client_id = silc_id_payload_parse_id(id_data, len);
if (!client_id) {
COMMAND_REPLY_ERROR;
- return;
+ goto out;
}
/* Get the client entry, if exists */
- if (silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
- SILC_ID_CLIENT, &id_cache))
+ 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;
silc_free(client_id);
realname = silc_argument_get_arg_type(cmd->args, 5, &len);
if (!nickname || !username) {
COMMAND_REPLY_ERROR;
- return;
+ goto out;
}
+
/* Notify application. We don't save any history information to any
cache. Just pass the data to the application for displaying on
the screen. */
return;
}
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
silc_client_command_reply_free(cmd);
}
SilcCommandStatus status)
{
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
- SilcClientID *client_id;
+ SilcClient client = cmd->client;
+ SilcClientID *client_id = NULL;
+ SilcServerID *server_id = NULL;
+ SilcChannelID *channel_id = NULL;
SilcIDCacheEntry id_cache = NULL;
- SilcClientEntry client_entry = NULL;
- int argc, len;
+ SilcClientEntry client_entry;
+ SilcServerEntry server_entry;
+ SilcChannelEntry channel_entry;
+ int argc;
+ uint32 len;
unsigned char *id_data;
- char *nickname = NULL, *username = NULL;
+ char *name = NULL, *info = NULL;
+ SilcIDPayload idp = NULL;
+ SilcIdType id_type;
argc = silc_argument_get_arg_num(cmd->args);
COMMAND_REPLY_ERROR;
return;
}
-
- client_id = silc_id_payload_parse_id(id_data, len);
- if (!client_id) {
+ idp = silc_id_payload_parse_data(id_data, len);
+ if (!idp) {
COMMAND_REPLY_ERROR;
return;
}
-
- nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
- username = silc_argument_get_arg_type(cmd->args, 4, &len);
- /* Check if we have this client cached already. */
- if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
- SILC_ID_CLIENT, &id_cache)) {
- SILC_LOG_DEBUG(("Adding new client entry"));
+ name = silc_argument_get_arg_type(cmd->args, 3, &len);
+ info = silc_argument_get_arg_type(cmd->args, 4, &len);
- client_entry = silc_calloc(1, sizeof(*client_entry));
- client_entry->id = client_id;
- silc_parse_nickname(nickname, &client_entry->nickname,
- &client_entry->server, &client_entry->num);
- if (username)
- client_entry->username = strdup(username);
-
- /* Add client to cache */
- silc_idcache_add(conn->client_cache, client_entry->nickname,
- strlen(client_entry->nickname),
- SILC_ID_CLIENT, client_id, (void *)client_entry,
- TRUE, FALSE);
- } else {
- client_entry = (SilcClientEntry)id_cache->context;
- if (client_entry->nickname)
- silc_free(client_entry->nickname);
- if (client_entry->server)
- silc_free(client_entry->server);
- if (username && client_entry->username)
- silc_free(client_entry->username);
-
- SILC_LOG_DEBUG(("Updating client entry"));
+ id_type = silc_id_payload_get_type(idp);
- silc_parse_nickname(nickname, &client_entry->nickname,
- &client_entry->server, &client_entry->num);
-
- if (username)
- client_entry->username = strdup(username);
-
- id_cache->data = client_entry->nickname;
- id_cache->data_len = strlen(client_entry->nickname);
- silc_idcache_sort_by_data(conn->client_cache);
-
- silc_free(client_id);
+ switch (id_type) {
+ case SILC_ID_CLIENT:
+ client_id = silc_id_payload_get_id(idp);
+
+ 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)) {
+ 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);
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, client_entry, name, info));
+ break;
+
+ case SILC_ID_SERVER:
+ server_id = silc_id_payload_get_id(idp);
+
+ 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)) {
+ 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, FALSE);
+ } else {
+ server_entry = (SilcServerEntry)id_cache->context;
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, server_entry, name, info));
+ break;
+
+ case SILC_ID_CHANNEL:
+ channel_id = silc_id_payload_get_id(idp);
+
+ 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)) {
+ 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;
+ }
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, channel_entry, name, info));
+ break;
}
- /* Notify application */
- COMMAND_REPLY((ARGS, client_entry, nickname, username));
+ silc_id_payload_free(idp);
+ silc_free(client_id);
+ silc_free(server_id);
+ silc_free(channel_id);
}
/* Received reply for IDENTIFY command. This maybe called several times
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcCommandStatus status;
- unsigned char *tmp;
- SILC_LOG_DEBUG(("Start"));
-
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
- 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;
- }
-
- /* Save one IDENTIFY entry */
- if (status == SILC_STATUS_OK)
- silc_client_command_reply_identify_save(cmd, status);
+ COMMAND_CHECK_STATUS_LIST;
- /* List */
- if (status == SILC_STATUS_LIST_START ||
- status == SILC_STATUS_LIST_ITEM ||
- status == SILC_STATUS_LIST_END)
- silc_client_command_reply_identify_save(cmd, status);
+ /* Save IDENTIFY info */
+ silc_client_command_reply_identify_save(cmd, status);
/* Pending callbacks are not executed if this was an list entry */
if (status != SILC_STATUS_OK &&
return;
}
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY);
silc_client_command_reply_free(cmd);
}
SilcCommandStatus status;
SilcIDPayload idp;
unsigned char *tmp;
- unsigned int argc, len;
+ uint32 argc, len;
SILC_LOG_DEBUG(("Start"));
SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn, "Cannot set nickname: %s",
- silc_client_command_status_message(status));
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "Cannot set nickname: %s",
+ silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
goto out;
}
argc = silc_argument_get_arg_num(cmd->args);
if (argc < 2 || argc > 2) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"Cannot set nickname: bad reply to command");
COMMAND_REPLY_ERROR;
goto out;
/* Notify application */
COMMAND_REPLY((ARGS, conn->local_entry));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_NICK);
silc_client_command_reply_free(cmd);
}
+/* Received reply to the LIST command. */
+
SILC_CLIENT_CMD_REPLY_FUNC(list)
{
+ SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+ SilcCommandStatus status;
+ unsigned char *tmp, *name, *topic;
+ uint32 usercount = 0;
+
+ COMMAND_CHECK_STATUS_LIST;
+
+ name = silc_argument_get_arg_type(cmd->args, 3, NULL);
+ 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);
+
+ /* Notify application */
+ 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) {
+ 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);
}
/* Received reply to topic command. */
SilcIDCacheEntry id_cache = NULL;
unsigned char *tmp;
char *topic;
- unsigned int argc, len;
+ uint32 argc, len;
SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"%s", silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_TOPIC);
- silc_client_command_reply_free(cmd);
- return;
+ goto out;
}
argc = silc_argument_get_arg_num(cmd->args);
if (!channel_id)
goto out;
- /* Get the channel name */
+ /* Get the channel entry */
if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- SILC_ID_CHANNEL, &id_cache)) {
+ &id_cache)) {
silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
channel = (SilcChannelEntry)id_cache->context;
- cmd->client->ops->say(cmd->client, conn,
- "Topic on channel %s: %s", channel->channel_name,
- topic);
-
/* Notify application */
COMMAND_REPLY((ARGS, channel, topic));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_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;
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"%s", silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INVITE);
- silc_client_command_reply_free(cmd);
- return;
+ goto out;
+ }
+
+ /* Take Channel ID */
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
+ if (!tmp)
+ goto out;
+
+ channel_id = silc_id_payload_parse_id(tmp, len);
+ if (!channel_id)
+ goto out;
+
+ /* Get the channel entry */
+ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
+ &id_cache)) {
+ 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);
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((ARGS, channel, tmp));
- /* Execute any pending command callbacks */
+ 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;
- unsigned char *tmp;
- tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
+ SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL);
-
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;
- SilcClient client = cmd->client;
SilcCommandStatus status;
unsigned char *tmp;
+ SilcIDCacheEntry id_cache;
+ SilcServerEntry server;
+ SilcServerID *server_id = NULL;
+ char *server_name, *server_info;
+ uint32 len;
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"%s", silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INFO);
- silc_client_command_reply_free(cmd);
- return;
+ goto out;
}
/* Get server ID */
- tmp = silc_argument_get_arg_type(cmd->args, 2, NULL);
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
if (!tmp)
goto out;
- /* XXX save server id */
+ server_id = silc_id_payload_parse_id(tmp, len);
+ if (!server_id)
+ goto out;
/* Get server name */
- tmp = silc_argument_get_arg_type(cmd->args, 3, NULL);
- if (!tmp)
+ server_name = silc_argument_get_arg_type(cmd->args, 3, NULL);
+ if (!server_name)
goto out;
/* Get server info */
- tmp = silc_argument_get_arg_type(cmd->args, 4, NULL);
- if (!tmp)
+ server_info = silc_argument_get_arg_type(cmd->args, 4, NULL);
+ if (!server_info)
goto out;
- client->ops->say(cmd->client, conn, "Info: %s", tmp);
+ /* 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)) {
+ SILC_LOG_DEBUG(("New server entry"));
- /* Notify application */
- COMMAND_REPLY((ARGS, NULL, (char *)tmp));
+ 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);
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO);
+ /* Add it to the cache */
+ silc_idcache_add(conn->server_cache, server->server_name,
+ server->server_id, (void *)server, FALSE);
+ } else {
+ server = (SilcServerEntry)id_cache->context;
+ }
+
+ /* 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);
}
SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"%s", silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
goto out;
}
for (i = 0; i < conn->ping_count; i++) {
- if (!SILC_ID_SERVER_COMPARE(conn->ping[i].dest_id, id)) {
+ if (SILC_ID_SERVER_COMPARE(conn->ping[i].dest_id, id)) {
diff = curtime - conn->ping[i].start_time;
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO,
"Ping reply from %s: %d second%s",
conn->ping[i].dest_name, diff,
diff == 1 ? "" : "s");
/* Notify application */
COMMAND_REPLY((ARGS));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_PING);
silc_client_command_reply_free(cmd);
}
SilcChannelEntry channel;
SilcIDCacheEntry id_cache = NULL;
SilcChannelUser chu;
- unsigned int argc, mode, len, list_count;
+ uint32 argc, mode, len, list_count;
char *topic, *tmp, *channel_name = NULL, *hmac;
- SilcBuffer keyp, client_id_list, client_mode_list;
+ 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) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"%s", silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
goto out;
argc = silc_argument_get_arg_num(cmd->args);
if (argc < 7 || argc > 14) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"Cannot join channel: Bad reply packet");
COMMAND_REPLY_ERROR;
goto out;
/* Get channel name */
tmp = silc_argument_get_arg_type(cmd->args, 2, NULL);
if (!tmp) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"Cannot join channel: Bad reply packet");
COMMAND_REPLY_ERROR;
goto out;
/* Get Channel ID */
tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
if (!tmp) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"Cannot join channel: Bad reply packet");
COMMAND_REPLY_ERROR;
silc_free(channel_name);
/* Get channel key */
tmp = silc_argument_get_arg_type(cmd->args, 7, &len);
- if (!tmp) {
- silc_id_payload_free(idp);
- silc_free(channel_name);
- goto out;
+ if (tmp) {
+ keyp = silc_buffer_alloc(len);
+ silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
+ silc_buffer_put(keyp, tmp, len);
}
- keyp = silc_buffer_alloc(len);
- silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
- silc_buffer_put(keyp, tmp, 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 */
+ 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);
+ conn->current_channel = channel;
+
/* Get hmac */
hmac = silc_argument_get_arg_type(cmd->args, 11, NULL);
if (hmac) {
if (!silc_hmac_alloc(hmac, NULL, &channel->hmac)) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"Cannot join channel: Unsupported HMAC `%s'",
hmac);
COMMAND_REPLY_ERROR;
/* Add clients we received in the reply to the channel */
for (i = 0; i < list_count; i++) {
- unsigned short idp_len;
- unsigned int mode;
+ uint16 idp_len;
+ uint32 mode;
SilcClientID *client_id;
SilcClientEntry client_entry;
SILC_GET32_MSB(mode, client_mode_list->data);
/* Check if we have this client cached already. */
- if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
- SILC_ID_CLIENT, &id_cache)) {
+ if (!silc_idcache_find_by_id_one_ext(conn->client_cache,
+ (void *)client_id,
+ NULL, NULL,
+ silc_hash_client_id_compare, NULL,
+ &id_cache)) {
/* No, we don't have it, add entry for it. */
- client_entry = silc_calloc(1, sizeof(*client_entry));
- client_entry->id = silc_id_dup(client_id, SILC_ID_CLIENT);
- silc_idcache_add(conn->client_cache, NULL, 0, SILC_ID_CLIENT,
- client_entry->id, (void *)client_entry, FALSE, FALSE);
+ 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;
client_mode_list->head);
/* Save channel key */
- silc_client_save_channel_key(conn, keyp, channel);
+ 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;
/* Notify application */
- COMMAND_REPLY((ARGS, channel_name, channel, mode, 0, keyp->head, NULL,
+ COMMAND_REPLY((ARGS, channel_name, channel, mode, 0,
+ keyp ? keyp->head : NULL, NULL,
NULL, topic, hmac, list_count, client_id_list,
client_mode_list));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
-
- silc_buffer_free(keyp);
- silc_buffer_free(client_id_list);
- silc_buffer_free(client_mode_list);
-
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)
+ silc_buffer_free(keyp);
+ if (client_id_list)
+ silc_buffer_free(client_id_list);
+ if (client_mode_list)
+ silc_buffer_free(client_mode_list);
}
/* Received reply for MOTD command */
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcCommandStatus status;
- unsigned int argc, i;
+ uint32 argc, i;
unsigned char *tmp;
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) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"%s", silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
return;
}
argc = silc_argument_get_arg_num(cmd->args);
- if (argc > 2) {
+ if (argc > 3) {
COMMAND_REPLY_ERROR;
goto out;
}
- if (argc == 2) {
- motd = silc_argument_get_arg_type(cmd->args, 2, NULL);
+ if (argc == 3) {
+ motd = silc_argument_get_arg_type(cmd->args, 3, NULL);
if (!motd) {
COMMAND_REPLY_ERROR;
goto out;
if (i == 2)
line[0] = ' ';
- cmd->client->ops->say(cmd->client, conn, "%s", line);
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO,
+ "%s", line);
if (!strlen(cp))
break;
/* Notify application */
COMMAND_REPLY((ARGS, motd));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_MOTD);
silc_client_command_reply_free(cmd);
}
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcCommandStatus status;
unsigned char *tmp;
- unsigned int mode;
+ uint32 mode;
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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, mode));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_UMODE);
silc_client_command_reply_free(cmd);
}
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
SilcCommandStatus status;
unsigned char *tmp;
+ uint32 mode;
+ SilcIDCacheEntry id_cache;
+ SilcChannelID *channel_id;
+ SilcChannelEntry channel;
+ uint32 len;
SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"%s", silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
goto out;
}
+ /* Take Channel ID */
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
+ if (!tmp)
+ goto out;
+ channel_id = silc_id_payload_parse_id(tmp, len);
+ if (!channel_id)
+ goto out;
+
+ /* Get the channel entry */
+ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
+ &id_cache)) {
+ 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, 2, NULL);
+ tmp = silc_argument_get_arg_type(cmd->args, 3, NULL);
if (!tmp) {
+ silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
}
+ /* Save the mode */
+ SILC_GET32_MSB(mode, tmp);
+ channel->mode = mode;
+
/* Notify application */
- COMMAND_REPLY((ARGS, tmp));
+ COMMAND_REPLY((ARGS, channel, mode));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CMODE);
+ silc_free(channel_id);
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CMODE);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CMODE);
silc_client_command_reply_free(cmd);
}
SilcCommandStatus status;
SilcIDCacheEntry id_cache = NULL;
SilcClientID *client_id;
- unsigned char *tmp, *id;
- unsigned int len;
+ SilcChannelID *channel_id;
+ SilcClientEntry client_entry;
+ SilcChannelEntry channel;
+ SilcChannelUser chu;
+ unsigned char *modev, *tmp, *id;
+ uint32 len, mode;
SILC_GET16_MSB(status, silc_argument_get_arg_type(cmd->args, 1, NULL));
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
"%s", silc_client_command_status_message(status));
COMMAND_REPLY_ERROR;
goto out;
}
/* Get channel mode */
- tmp = silc_argument_get_arg_type(cmd->args, 2, NULL);
- if (!tmp) {
+ modev = silc_argument_get_arg_type(cmd->args, 2, NULL);
+ if (!modev) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Take Channel ID */
+ tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
+ if (!tmp)
+ goto out;
+ channel_id = silc_id_payload_parse_id(tmp, len);
+ if (!channel_id)
+ goto out;
+
+ /* Get the channel entry */
+ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
+ &id_cache)) {
+ 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, 3, &len);
+ id = silc_argument_get_arg_type(cmd->args, 4, &len);
if (!id) {
+ silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
}
client_id = silc_id_payload_parse_id(id, len);
if (!client_id) {
+ silc_free(channel_id);
COMMAND_REPLY_ERROR;
goto out;
}
/* Get client entry */
- if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
- SILC_ID_CLIENT, &id_cache)) {
+ if (!silc_idcache_find_by_id_one_ext(conn->client_cache, (void *)client_id,
+ NULL, NULL,
+ silc_hash_client_id_compare, NULL,
+ &id_cache)) {
+ 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;
+ }
+ }
+
/* Notify application */
- COMMAND_REPLY((ARGS, tmp, (SilcClientEntry)id_cache->context));
+ COMMAND_REPLY((ARGS, mode, channel, client_entry));
silc_free(client_id);
+ silc_free(channel_id);
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CUMODE);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CUMODE);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CUMODE);
silc_client_command_reply_free(cmd);
}
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KICK);
silc_client_command_reply_free(cmd);
}
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SILCOPER);
silc_client_command_reply_free(cmd);
}
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_OPER);
silc_client_command_reply_free(cmd);
}
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CONNECT);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CONNECT);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CONNECT);
silc_client_command_reply_free(cmd);
}
-SILC_CLIENT_CMD_REPLY_FUNC(restart)
+SILC_CLIENT_CMD_REPLY_FUNC(ban)
{
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;
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
+ /* Take Channel ID */
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
+ if (!tmp)
+ goto out;
+
+ channel_id = silc_id_payload_parse_id(tmp, len);
+ if (!channel_id)
+ goto out;
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_RESTART);
+ /* Get the channel entry */
+ if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
+ &id_cache)) {
+ 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);
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, channel, tmp));
out:
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_RESTART);
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_BAN);
+ SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_BAN);
silc_client_command_reply_free(cmd);
}
-
+
SILC_CLIENT_CMD_REPLY_FUNC(close)
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CLOSE);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CLOSE);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CLOSE);
silc_client_command_reply_free(cmd);
}
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SHUTDOWN);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SHUTDOWN);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_SHUTDOWN);
silc_client_command_reply_free(cmd);
}
tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
SILC_GET16_MSB(status, tmp);
if (status != SILC_STATUS_OK) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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));
- /* Execute any pending command callbacks */
- SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE);
-
out:
+ SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE);
SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_LEAVE);
silc_client_command_reply_free(cmd);
}
SilcChannelEntry channel;
SilcChannelUser chu;
SilcChannelID *channel_id = NULL;
- SilcBuffer client_id_list;
- SilcBuffer client_mode_list;
+ SilcBuffer client_id_list = NULL;
+ SilcBuffer client_mode_list = NULL;
unsigned char *tmp;
- unsigned int tmp_len, list_count;
+ uint32 tmp_len, list_count;
int i;
unsigned char **res_argv = NULL;
- unsigned int *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0;
+ uint32 *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) {
- cmd->client->ops->say(cmd->client, conn,
+ cmd->client->ops->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)
+ if (!tmp) {
+ COMMAND_REPLY_ERROR;
goto out;
+ }
channel_id = silc_id_payload_parse_id(tmp, tmp_len);
- if (!channel_id)
+ if (!channel_id) {
+ COMMAND_REPLY_ERROR;
goto out;
-
+ }
+
/* Get the list count */
tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
- if (!tmp)
+ if (!tmp) {
+ COMMAND_REPLY_ERROR;
goto out;
+ }
SILC_GET32_MSB(list_count, tmp);
/* Get Client ID list */
tmp = silc_argument_get_arg_type(cmd->args, 4, &tmp_len);
- if (!tmp)
+ if (!tmp) {
+ COMMAND_REPLY_ERROR;
goto out;
+ }
client_id_list = silc_buffer_alloc(tmp_len);
silc_buffer_pull_tail(client_id_list, tmp_len);
/* Get client mode list */
tmp = silc_argument_get_arg_type(cmd->args, 5, &tmp_len);
- if (!tmp)
+ if (!tmp) {
+ COMMAND_REPLY_ERROR;
goto out;
+ }
client_mode_list = silc_buffer_alloc(tmp_len);
silc_buffer_pull_tail(client_mode_list, tmp_len);
/* Get channel entry */
if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
- SILC_ID_CHANNEL, &id_cache)) {
- COMMAND_REPLY_ERROR;
- goto out;
+ &id_cache)) {
+ /* 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);
+ return;
+ } else {
+ channel = (SilcChannelEntry)id_cache->context;
}
- channel = (SilcChannelEntry)id_cache->context;
/* Remove old client list from channel. */
silc_list_start(channel->clients);
silc_free(chu);
}
- /* Cache the received Client ID's and modes. This cache expires
- whenever server sends notify message to channel. It means two things;
- some user has joined or leaved the channel. XXX! */
+ /* Cache the received Client ID's and modes. */
for (i = 0; i < list_count; i++) {
- unsigned short idp_len;
- unsigned int mode;
+ uint16 idp_len;
+ uint32 mode;
SilcClientID *client_id;
SilcClientEntry client;
SILC_GET32_MSB(mode, client_mode_list->data);
/* Check if we have this client cached already. */
- if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
- SILC_ID_CLIENT, &id_cache)) {
- /* No we don't have it, query it from the server. Assemble argument
- table that will be sent fr the IDENTIFY command later. */
+ 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) {
+ /* No we don't have it (or it is incomplete in information), query
+ it from the server. Assemble argument table that will be sent
+ for the WHOIS command later. */
res_argv = silc_realloc(res_argv, sizeof(*res_argv) *
(res_argc + 1));
res_argv_lens = silc_realloc(res_argv_lens, sizeof(*res_argv_lens) *
if (res_argc) {
SilcBuffer res_cmd;
- /* Send the IDENTIFY command to server */
- res_cmd = silc_command_payload_encode(SILC_COMMAND_IDENTIFY,
+ /* Send the WHOIS command to server */
+ res_cmd = silc_command_payload_encode(SILC_COMMAND_WHOIS,
res_argc, res_argv, res_argv_lens,
res_argv_types, ++conn->cmd_ident);
silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND,
NULL, 0, NULL, NULL, res_cmd->data, res_cmd->len,
TRUE);
- /* Register pending command callback. After we've received the IDENTIFY
+ /* Register pending command callback. After we've received the WHOIS
command reply 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,
+ silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
NULL, silc_client_command_reply_users, cmd);
silc_buffer_free(res_cmd);
/* Notify application */
COMMAND_REPLY((ARGS, channel, list_count, client_id_list, client_mode_list));
- /* Execute any pending command callbacks */
+ 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)
+ 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
+ client's public key. */
+
+SILC_CLIENT_CMD_REPLY_FUNC(getkey)
+{
+ 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;
+ SilcServerID *server_id = NULL;
+ SilcServerEntry server_entry;
+ SilcSKEPKType type;
+ unsigned char *tmp, *pk;
+ uint32 len;
+ uint16 pk_len;
+ SilcIdType id_type;
+ SilcPublicKey public_key = NULL;
- silc_buffer_free(client_id_list);
- silc_buffer_free(client_mode_list);
+ SILC_LOG_DEBUG(("Start"));
+
+ tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
+ SILC_GET16_MSB(status, tmp);
+ if (status != SILC_STATUS_OK) {
+ cmd->client->ops->say(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "%s", silc_client_command_status_message(status));
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
+ if (!tmp) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+ idp = silc_id_payload_parse_data(tmp, len);
+ if (!idp) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ /* Get the public key payload */
+ tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
+ if (tmp) {
+ /* Decode the public key */
+ SILC_GET16_MSB(pk_len, tmp);
+ SILC_GET16_MSB(type, tmp + 2);
+ pk = tmp + 4;
+
+ if (type != SILC_SKE_PK_TYPE_SILC) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key)) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+ }
+
+ 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)) {
+ 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)) {
+ COMMAND_REPLY_ERROR;
+ goto out;
+ }
+
+ server_entry = (SilcServerEntry)id_cache->context;
+
+ /* Notify application */
+ COMMAND_REPLY((ARGS, id_type, server_entry, public_key));
+ }
out:
- if (channel_id)
- silc_free(channel_id);
- SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_USERS);
+ 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)
+ silc_pkcs_public_key_free(public_key);
+ silc_free(client_id);
+ silc_free(server_id);
silc_client_command_reply_free(cmd);
}
projects / silc.git / blobdiff