/* Notify application */
if (!cmd->callbacks_count && notify)
- COMMAND_REPLY((ARGS, client_entry, nickname, username, realname,
+ COMMAND_REPLY((SILC_ARGS, client_entry, nickname, username, realname,
has_channels ? &channels : NULL, mode, idle,
fingerprint, has_user_modes ? &ch_user_modes : NULL,
client_entry->attrs));
/* Notify application. We don't save any history information to any
cache. Just pass the data to the application for displaying on
the screen. */
- COMMAND_REPLY((ARGS, client_entry, nickname, username, realname));
+ COMMAND_REPLY((SILC_ARGS, client_entry, nickname, username, realname));
/* Pending callbacks are not executed if this was an list entry */
if (cmd->status != SILC_STATUS_OK &&
/* Notify application */
if (notify)
- COMMAND_REPLY((ARGS, client_entry, name, info));
+ COMMAND_REPLY((SILC_ARGS, client_entry, name, info));
break;
case SILC_ID_SERVER:
/* Notify application */
if (notify)
- COMMAND_REPLY((ARGS, server_entry, name, info));
+ COMMAND_REPLY((SILC_ARGS, server_entry, name, info));
break;
case SILC_ID_CHANNEL:
/* Notify application */
if (notify)
- COMMAND_REPLY((ARGS, channel_entry, name, info));
+ COMMAND_REPLY((SILC_ARGS, channel_entry, name, info));
break;
}
/* Take the new nickname too */
tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
if (tmp) {
- silc_idcache_del_by_context(conn->client_cache, conn->local_entry);
+ silc_idcache_del_by_context(conn->internal->client_cache,
+ conn->local_entry);
if (conn->nickname)
silc_free(conn->nickname);
conn->nickname = strdup(tmp);
conn->local_entry->nickname = conn->nickname;
silc_client_nickname_format(cmd->client, conn, conn->local_entry);
- silc_idcache_add(conn->client_cache, strdup(tmp),
+ silc_idcache_add(conn->internal->client_cache, strdup(tmp),
conn->local_entry->id, conn->local_entry, 0, NULL);
}
/* Notify application */
- COMMAND_REPLY((ARGS, conn->local_entry, conn->local_entry->nickname));
+ COMMAND_REPLY((SILC_ARGS, conn->local_entry, conn->local_entry->nickname));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK);
}
/* Notify application */
- COMMAND_REPLY((ARGS, channel_entry, name, topic, usercount));
+ COMMAND_REPLY((SILC_ARGS, channel_entry, name, topic, usercount));
/* Pending callbacks are not executed if this was an list entry */
if (cmd->status != SILC_STATUS_OK &&
}
/* Notify application */
- COMMAND_REPLY((ARGS, channel, topic));
+ COMMAND_REPLY((SILC_ARGS, channel, topic));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC);
SilcChannelID *channel_id;
unsigned char *tmp;
SilcUInt32 len;
+ SilcBufferStruct buf;
if (cmd->error != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
/* Get the invite list */
tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
-
+ if (tmp)
+ silc_buffer_set(&buf, tmp, len);
+
/* Notify application */
- COMMAND_REPLY((ARGS, channel, tmp));
+ COMMAND_REPLY((SILC_ARGS, channel, tmp ? &buf : NULL));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INVITE);
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL);
}
/* Notify application */
- COMMAND_REPLY((ARGS, server, server->server_name, server->server_info));
+ COMMAND_REPLY((SILC_ARGS, server, server->server_name, server->server_info));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO);
buf = silc_argument_get_arg_type(cmd->args, 3, &buf_len);
/* Notify application */
- COMMAND_REPLY((ARGS, buf, buf_len));
+ COMMAND_REPLY((SILC_ARGS, buf, buf_len));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_STATS);
curtime = time(NULL);
id = silc_id_str2id(cmd->packet->src_id, cmd->packet->src_id_len,
cmd->packet->src_id_type);
- if (!id || !conn->ping) {
+ if (!id || !conn->internal->ping) {
COMMAND_REPLY_ERROR;
goto out;
}
- for (i = 0; i < conn->ping_count; i++) {
- if (!conn->ping[i].dest_id)
+ for (i = 0; i < conn->internal->ping_count; i++) {
+ if (!conn->internal->ping[i].dest_id)
continue;
- if (SILC_ID_SERVER_COMPARE(conn->ping[i].dest_id, id)) {
- diff = curtime - conn->ping[i].start_time;
+ if (SILC_ID_SERVER_COMPARE(conn->internal->ping[i].dest_id, id)) {
+ diff = curtime - conn->internal->ping[i].start_time;
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_INFO,
"Ping reply from %s: %d second%s",
- conn->ping[i].dest_name, diff,
+ conn->internal->ping[i].dest_name, diff,
diff == 1 ? "" : "s");
- conn->ping[i].start_time = 0;
- silc_free(conn->ping[i].dest_id);
- conn->ping[i].dest_id = NULL;
- silc_free(conn->ping[i].dest_name);
- conn->ping[i].dest_name = NULL;
+ conn->internal->ping[i].start_time = 0;
+ silc_free(conn->internal->ping[i].dest_id);
+ conn->internal->ping[i].dest_id = NULL;
+ silc_free(conn->internal->ping[i].dest_name);
+ conn->internal->ping[i].dest_name = NULL;
break;
}
}
silc_free(id);
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING);
silc_client_save_channel_key(cmd->client, conn, keyp, channel);
/* Notify application */
- COMMAND_REPLY((ARGS, channel_name, channel, mode, 0,
+ COMMAND_REPLY((SILC_ARGS, channel_name, channel, mode, 0,
keyp ? keyp->head : NULL, NULL,
NULL, topic, hmac, list_count, client_id_list,
client_mode_list));
}
/* Notify application */
- COMMAND_REPLY((ARGS, motd));
+ COMMAND_REPLY((SILC_ARGS, motd));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD);
conn->local_entry->mode = mode;
/* Notify application */
- COMMAND_REPLY((ARGS, mode));
+ COMMAND_REPLY((SILC_ARGS, mode));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_UMODE);
COMMAND_REPLY_ERROR;
goto out;
}
-
+
/* Get channel mode */
tmp = silc_argument_get_arg_type(cmd->args, 3, NULL);
if (!tmp) {
channel->mode = mode;
/* Notify application */
- COMMAND_REPLY((ARGS, channel, mode));
+ COMMAND_REPLY((SILC_ARGS, channel, mode));
silc_free(channel_id);
chu->mode = mode;
/* Notify application */
- COMMAND_REPLY((ARGS, mode, channel, client_entry));
+ COMMAND_REPLY((SILC_ARGS, mode, channel, client_entry));
silc_free(client_id);
silc_free(channel_id);
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK);
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER);
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER);
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
/* Generate the detachment data and deliver it to the client in the
detach client operation */
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WATCH);
SilcChannelID *channel_id;
unsigned char *tmp;
SilcUInt32 len;
+ SilcBufferStruct buf;
if (cmd->error != SILC_STATUS_OK) {
SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
/* Get the ban list */
tmp = silc_argument_get_arg_type(cmd->args, 3, &len);
-
+ if (tmp)
+ silc_buffer_set(&buf, tmp, len);
+
/* Notify application */
- COMMAND_REPLY((ARGS, channel, tmp));
+ COMMAND_REPLY((SILC_ARGS, channel, tmp ? &buf : NULL));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_BAN);
}
/* Notify application */
- COMMAND_REPLY((ARGS, channel));
+ COMMAND_REPLY((SILC_ARGS, channel));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE);
/* Notify application */
if (notify)
- COMMAND_REPLY((ARGS, channel, list_count, &client_id_list,
+ COMMAND_REPLY((SILC_ARGS, channel, list_count, &client_id_list,
&client_mode_list));
out:
{
SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+ SilcClientCommandReplyContext r = (SilcClientCommandReplyContext)context2;
SILC_LOG_DEBUG(("Start"));
goto out;
}
+ if (r && !silc_command_get_status(r->payload, NULL, &cmd->error)) {
+ SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
+ "%s", silc_get_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))
SilcClientEntry client_entry;
SilcServerID *server_id = NULL;
SilcServerEntry server_entry;
- SilcSKEPKType type;
- unsigned char *tmp, *pk;
+ unsigned char *tmp;
SilcUInt32 len;
- SilcUInt16 pk_len;
SilcIdType id_type;
SilcPublicKey public_key = NULL;
/* 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)
- if (!silc_pkcs_public_key_decode(pk, pk_len, &public_key))
- public_key = NULL;
- }
+ if (!silc_pkcs_public_key_payload_decode(tmp, len, &public_key))
+ public_key = NULL;
+ }
id_type = silc_id_payload_get_type(idp);
if (id_type == SILC_ID_CLIENT) {
goto out;
}
+ /* Save fingerprint */
+ if (!client_entry->fingerprint) {
+ client_entry->fingerprint = silc_calloc(20, sizeof(unsigned char));
+ client_entry->fingerprint_len = 20;
+ silc_hash_make(cmd->client->sha1hash, tmp + 4, len - 4,
+ client_entry->fingerprint);
+ }
+
/* Notify application */
- COMMAND_REPLY((ARGS, id_type, client_entry, public_key));
+ COMMAND_REPLY((SILC_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);
}
/* Notify application */
- COMMAND_REPLY((ARGS, id_type, server_entry, public_key));
+ COMMAND_REPLY((SILC_ARGS, id_type, server_entry, public_key));
}
out:
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CONNECT);
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CLOSE);
}
/* Notify application */
- COMMAND_REPLY((ARGS));
+ COMMAND_REPLY((SILC_ARGS));
out:
SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_SHUTDOWN);
projects / silc.git / blobdiff