Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
- Copyright (C) 1997 - 2000 Pekka Riikonen
+ Copyright (C) 1997 - 2001 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
command reply routine receiving it. */
ctx = silc_calloc(1, sizeof(*ctx));
ctx->server = server;
- ctx->sock = sock;
+ ctx->sock = silc_socket_dup(sock);
ctx->payload = payload;
ctx->args = silc_command_get_args(ctx->payload);
ident = silc_command_get_ident(ctx->payload);
break;
if (cmd == NULL || !cmd->cb) {
- silc_free(ctx);
+ silc_server_command_reply_free(ctx);
return;
}
{
if (cmd) {
silc_command_free_payload(cmd->payload);
+ if (cmd->sock)
+ silc_socket_free(cmd->sock); /* Decrease the reference counter */
silc_free(cmd);
}
}
nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
username = silc_argument_get_arg_type(cmd->args, 4, &len);
realname = silc_argument_get_arg_type(cmd->args, 5, &len);
- if (!id_data || !nickname || !username || !realname)
+ if (!id_data || !nickname || !username || !realname) {
+ SILC_LOG_ERROR(("Incomplete WHOIS info: %s %s %s",
+ nickname ? nickname : "",
+ username ? username : "",
+ realname ? realname : ""));
return FALSE;
+ }
client_id = silc_id_payload_parse_id(id_data, id_len);
+ if (!client_id)
+ return FALSE;
/* Check if we have this client cached already. */
global. */
silc_idlist_add_client(server->global_list, nick,
strdup(username),
- strdup(realname), client_id, NULL, NULL);
+ strdup(realname), client_id,
+ cmd->sock->user_data, NULL);
} else {
/* We have the client already, update the data */
if (!silc_server_command_reply_whois_save(cmd))
goto out;
- /* XXX */
-
- /* Process one identify reply */
- if (status == SILC_STATUS_OK) {
-
- }
-
- if (status == SILC_STATUS_LIST_START) {
-
- }
-
- if (status == SILC_STATUS_LIST_ITEM) {
-
- }
-
- if (status == SILC_STATUS_LIST_END) {
-
- }
-
/* Execute any pending commands */
- SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_WHOIS);
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
silc_server_command_reply_free(cmd);
}
return FALSE;
client_id = silc_id_payload_parse_id(id_data, id_len);
+ if (!client_id)
+ return FALSE;
/* Check if we have this client cached already. */
global. */
silc_idlist_add_client(server->global_list, nick,
username ? strdup(username) : NULL, NULL,
- client_id, NULL, NULL);
+ client_id, cmd->sock->user_data, NULL);
} else {
/* We have the client already, update the data */
if (!silc_server_command_reply_identify_save(cmd))
goto out;
- /* XXX */
-
- if (status == SILC_STATUS_OK) {
-
- }
-
- if (status == SILC_STATUS_LIST_START) {
-
- }
-
- if (status == SILC_STATUS_LIST_ITEM) {
-
- }
-
- if (status == SILC_STATUS_LIST_END) {
-
- }
-
/* Execute any pending commands */
- SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_IDENTIFY);
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY);
out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY);
silc_server_command_reply_free(cmd);
}
SilcCommandStatus status;
SilcChannelID *id;
SilcChannelEntry entry;
- unsigned int len;
+ unsigned int id_len, len;
unsigned char *id_string;
- char *channel_name, *tmp;
+ char *channel_name, *tmp, *hmac;
unsigned int mode, created;
SilcBuffer keyp;
goto out;
/* Get channel ID */
- id_string = silc_argument_get_arg_type(cmd->args, 3, &len);
+ id_string = silc_argument_get_arg_type(cmd->args, 3, &id_len);
if (!id_string)
goto out;
if (!tmp)
goto out;
SILC_GET32_MSB(created, tmp);
+ if (created != 0 && created != 1)
+ goto out;
/* Get channel key */
tmp = silc_argument_get_arg_type(cmd->args, 6, &len);
silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
silc_buffer_put(keyp, tmp, len);
- id = silc_id_payload_parse_id(id_string, len);
+ id = silc_id_payload_parse_id(id_string, id_len);
+ if (!id)
+ goto out;
+
+ /* Get hmac */
+ hmac = silc_argument_get_arg_type(cmd->args, 10, NULL);
/* See whether we already have the channel. */
entry = silc_idlist_find_channel_by_id(server->local_list, id, NULL);
/* Add the channel to our local list. */
entry = silc_idlist_add_channel(server->local_list, strdup(channel_name),
SILC_CHANNEL_MODE_NONE, id,
- server->router, NULL);
+ server->router, NULL, hmac);
if (!entry) {
silc_free(id);
goto out;
silc_buffer_free(keyp);
/* Execute any pending commands */
- SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_JOIN);
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN);
silc_server_command_reply_free(cmd);
}
if (!tmp)
goto out;
channel_id = silc_id_payload_parse_id(tmp, tmp_len);
+ if (!channel_id)
+ goto out;
/* Get the list count */
tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
SILC_GET16_MSB(idp_len, client_id_list->data + 2);
idp_len += 4;
client_id = silc_id_payload_parse_id(client_id_list->data, idp_len);
+ if (!client_id)
+ continue;
silc_buffer_pull(client_id_list, idp_len);
/* Mode */
client = silc_idlist_add_client(server->global_list, NULL, NULL,
NULL, client_id, cmd->sock->user_data,
NULL);
+ if (!client) {
+ silc_free(client_id);
+ continue;
+ }
} else {
/* We have the client already. */
silc_free(client_id);
silc_buffer_free(client_mode_list);
/* Execute any pending commands */
- SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_USERS);
+ SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
out:
+ SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_USERS);
if (channel_id)
silc_free(channel_id);
silc_server_command_reply_free(cmd);