SILC_LOG_DEBUG(("Start"));
if (reply) {
- SilcCommandStatus status;
- unsigned char *tmp = silc_argument_get_arg_type(reply->args, 1, NULL);
- SILC_GET16_MSB(status, tmp);
+ SilcCommandStatus status = silc_command_get_status(reply->payload);
if (status != SILC_STATUS_OK)
goto out;
}
silc_free(res);
}
-/* Resolve client information from server by Client ID. */
+/* Resolve client, channel or server information. */
static void silc_client_notify_by_server_resolve(SilcClient client,
SilcClientConnection conn,
SilcPacketContext *packet,
- SilcClientID *client_id)
+ SilcIdType id_type,
+ void *id)
{
SilcClientNotifyResolve res = silc_calloc(1, sizeof(*res));
- SilcBuffer idp = silc_id_payload_encode(client_id, SILC_ID_CLIENT);
+ SilcBuffer idp = silc_id_payload_encode(id, id_type);
res->packet = silc_packet_context_dup(packet);
res->context = client;
res->sock = silc_socket_dup(conn->sock);
- silc_client_command_register(client, SILC_COMMAND_WHOIS, NULL, NULL,
- silc_client_command_reply_whois_i, 0,
- ++conn->cmd_ident);
- silc_client_command_send(client, conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
- 1, 3, idp->data, idp->len);
- silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
- silc_client_notify_by_server_pending, res);
+ /* For client resolving use WHOIS, and oterhwise use IDENTIFY */
+ if (id_type == SILC_ID_CLIENT) {
+ silc_client_command_register(client, SILC_COMMAND_WHOIS, NULL, NULL,
+ silc_client_command_reply_whois_i, 0,
+ ++conn->cmd_ident);
+ silc_client_command_send(client, conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
+ 1, 3, idp->data, idp->len);
+ silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
+ silc_client_notify_by_server_pending, res);
+ } else {
+ silc_client_command_register(client, SILC_COMMAND_IDENTIFY, NULL, NULL,
+ silc_client_command_reply_identify_i, 0,
+ ++conn->cmd_ident);
+ silc_client_command_send(client, conn, SILC_COMMAND_IDENTIFY,
+ conn->cmd_ident, 1, 5, idp->data, idp->len);
+ silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident,
+ silc_client_notify_by_server_pending, res);
+ }
silc_buffer_free(idp);
}
SilcNotifyType type;
SilcArgumentPayload args;
- SilcIDPayload idp;
+ void *id;
+ SilcIdType id_type;
SilcClientID *client_id = NULL;
SilcChannelID *channel_id = NULL;
SilcServerID *server_id = NULL;
if (!tmp)
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)
goto out;
if (!tmp)
goto out;
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
/* Find Client entry and if not found query it */
client_entry = silc_client_get_client_by_id(client, conn, client_id);
if (!client_entry) {
- silc_client_notify_by_server_resolve(client, conn, packet, client_id);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CLIENT, client_id);
goto out;
}
if (!tmp)
goto out;
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
/* Find Client entry and if not found query it */
client_entry = silc_client_get_client_by_id(client, conn, client_id);
if (!client_entry) {
- silc_client_notify_by_server_resolve(client, conn, packet, client_id);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CLIENT, client_id);
goto out;
}
goto out;
}
client_entry->status |= SILC_CLIENT_STATUS_RESOLVING;
- silc_client_notify_by_server_resolve(client, conn, packet, client_id);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CLIENT, client_id);
goto out;
} else {
if (client_entry != conn->local_entry)
if (!tmp)
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)
goto out;
if (!tmp)
goto out;
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
if (!tmp)
goto out;
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
SILC_LOG_DEBUG(("Notify: TOPIC_SET"));
- /* Get Client ID */
+ /* Get ID */
tmp = silc_argument_get_arg_type(args, 1, &tmp_len);
if (!tmp)
goto out;
-
- idp = silc_id_payload_parse(tmp, tmp_len);
- if (!idp)
+ id = silc_id_payload_parse_id(tmp, tmp_len, &id_type);
+ if (!id)
goto out;
/* Find Client entry */
- if (silc_id_payload_get_type(idp) == SILC_ID_CLIENT) {
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
- if (!client_id) {
- silc_id_payload_free(idp);
- goto out;
- }
-
+ if (id_type == SILC_ID_CLIENT) {
/* Find Client entry */
- client_entry =
- silc_client_get_client_by_id(client, conn, client_id);
- if (!client_entry)
- goto out;
- } else if (silc_id_payload_get_type(idp) == SILC_ID_SERVER) {
- server_id = silc_id_payload_parse_id(tmp, tmp_len);
- if (!server_id) {
- silc_id_payload_free(idp);
+ client_id = id;
+ client_entry = silc_client_get_client_by_id(client, conn, client_id);
+ if (!client_entry) {
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CLIENT, client_id);
goto out;
}
-
+ } else if (id_type == SILC_ID_SERVER) {
+ /* Find Server entry */
+ server_id = id;
server = silc_client_get_server_by_id(client, conn, server_id);
if (!server) {
- silc_id_payload_free(idp);
- silc_free(server_id);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_SERVER, server_id);
goto out;
}
/* Save the pointer to the client_entry pointer */
client_entry = (SilcClientEntry)server;
- silc_free(server_id);
} else {
- channel_id = silc_id_payload_parse_id(tmp, tmp_len);
- if (!channel_id) {
- silc_id_payload_free(idp);
- goto out;
- }
-
+ /* Find Channel entry */
+ channel_id = id;
channel = silc_client_get_channel_by_id(client, conn, channel_id);
if (!channel) {
- silc_id_payload_free(idp);
- silc_free(channel_id);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CHANNEL, channel_id);
goto out;
}
/* Save the pointer to the client_entry pointer */
client_entry = (SilcClientEntry)channel;
silc_free(channel_id);
+ channel_id = NULL;
}
/* Get topic */
/* Notify application. The channel entry is sent last as this notify
is for channel but application don't know it from the arguments
sent by server. */
- client->internal->ops->notify(client, conn, type,
- silc_id_payload_get_type(idp),
+ client->internal->ops->notify(client, conn, type, id_type,
client_entry, tmp, channel);
- silc_id_payload_free(idp);
break;
case SILC_NOTIFY_TYPE_NICK_CHANGE:
if (!tmp)
goto out;
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
if (!tmp)
goto out;
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
client_entry2 = silc_client_get_client_by_id(client, conn, client_id);
if (!client_entry2) {
/* Resolve the entry information */
- silc_client_notify_by_server_resolve(client, conn, packet, client_id);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CLIENT, client_id);
/* Add the new entry even though we resolved it. This is because we
want to replace the old entry with the new entry here right now. */
SILC_LOG_DEBUG(("Notify: CMODE_CHANGE"));
- /* Get Client ID */
+ /* Get ID */
tmp = silc_argument_get_arg_type(args, 1, &tmp_len);
if (!tmp)
goto out;
-
- idp = silc_id_payload_parse(tmp, tmp_len);
- if (!idp)
+ id = silc_id_payload_parse_id(tmp, tmp_len, &id_type);
+ if (!id)
goto out;
/* Find Client entry */
- if (silc_id_payload_get_type(idp) == SILC_ID_CLIENT) {
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
- if (!client_id) {
- silc_id_payload_free(idp);
- goto out;
- }
-
+ if (id_type == SILC_ID_CLIENT) {
+ /* Find Client entry */
+ client_id = id;
client_entry = silc_client_get_client_by_id(client, conn, client_id);
if (!client_entry) {
- silc_id_payload_free(idp);
- goto out;
- }
- } else {
- server_id = silc_id_payload_parse_id(tmp, tmp_len);
- if (!server_id) {
- silc_id_payload_free(idp);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CLIENT, client_id);
goto out;
}
-
+ } else if (id_type == SILC_ID_SERVER) {
+ /* Find Server entry */
+ server_id = id;
server = silc_client_get_server_by_id(client, conn, server_id);
if (!server) {
- silc_id_payload_free(idp);
- silc_free(server_id);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_SERVER, server_id);
goto out;
}
-
+
/* Save the pointer to the client_entry pointer */
client_entry = (SilcClientEntry)server;
- silc_free(server_id);
+ } else {
+ /* Find Channel entry */
+ channel_id = id;
+ channel = silc_client_get_channel_by_id(client, conn, channel_id);
+ if (!channel) {
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CHANNEL, channel_id);
+ goto out;
+ }
+
+ /* Save the pointer to the client_entry pointer */
+ client_entry = (SilcClientEntry)channel;
+ silc_free(channel_id);
+ channel_id = NULL;
}
/* Get the mode */
tmp = silc_argument_get_arg_type(args, 2, &tmp_len);
- if (!tmp) {
- silc_id_payload_free(idp);
+ if (!tmp)
goto out;
- }
SILC_GET32_MSB(mode, tmp);
/* Get channel entry */
channel_id = silc_id_str2id(packet->dst_id, packet->dst_id_len,
SILC_ID_CHANNEL);
- if (!channel_id) {
- silc_id_payload_free(idp);
+ if (!channel_id)
goto out;
- }
channel = silc_client_get_channel_by_id(client, conn, channel_id);
- if (!channel) {
- silc_id_payload_free(idp);
+ if (!channel)
goto out;
- }
/* Save the new mode */
channel->mode = mode;
/* Notify application. The channel entry is sent last as this notify
is for channel but application don't know it from the arguments
sent by server. */
- client->internal->ops->notify(client, conn, type,
- silc_id_payload_get_type(idp),
+ client->internal->ops->notify(client, conn, type, id_type,
client_entry, mode, NULL, tmp, channel);
-
- silc_id_payload_free(idp);
break;
case SILC_NOTIFY_TYPE_CUMODE_CHANGE:
SILC_LOG_DEBUG(("Notify: CUMODE_CHANGE"));
- /* Get Client ID */
+ /* Get ID */
tmp = silc_argument_get_arg_type(args, 1, &tmp_len);
if (!tmp)
goto out;
-
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
- if (!client_id)
+ id = silc_id_payload_parse_id(tmp, tmp_len, &id_type);
+ if (!id)
goto out;
/* Find Client entry */
- client_entry = silc_client_get_client_by_id(client, conn, client_id);
- if (!client_entry) {
- silc_client_notify_by_server_resolve(client, conn, packet, client_id);
- goto out;
+ if (id_type == SILC_ID_CLIENT) {
+ /* Find Client entry */
+ client_id = id;
+ client_entry = silc_client_get_client_by_id(client, conn, client_id);
+ if (!client_entry) {
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CLIENT, client_id);
+ goto out;
+ }
+ } else if (id_type == SILC_ID_SERVER) {
+ /* Find Server entry */
+ server_id = id;
+ server = silc_client_get_server_by_id(client, conn, server_id);
+ if (!server) {
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_SERVER, server_id);
+ goto out;
+ }
+
+ /* Save the pointer to the client_entry pointer */
+ client_entry = (SilcClientEntry)server;
+ } else {
+ /* Find Channel entry */
+ channel_id = id;
+ channel = silc_client_get_channel_by_id(client, conn, channel_id);
+ if (!channel) {
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CHANNEL, channel_id);
+ goto out;
+ }
+
+ /* Save the pointer to the client_entry pointer */
+ client_entry = (SilcClientEntry)channel;
+ silc_free(channel_id);
+ channel_id = NULL;
}
/* Get the mode */
goto out;
silc_free(client_id);
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
/* Notify application. The channel entry is sent last as this notify
is for channel but application don't know it from the arguments
sent by server. */
- client->internal->ops->notify(client, conn, type,
- client_entry, mode,
+ client->internal->ops->notify(client, conn, type,
+ id_type, client_entry, mode,
client_entry2, channel);
break;
tmp = silc_argument_get_arg_type(args, 1, &tmp_len);
if (!tmp)
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)
goto out;
tmp = silc_argument_get_arg_type(args, 2, &tmp_len);
if (!tmp)
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)
goto out;
if (!tmp)
goto out;
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
/* Get the kicker */
tmp = silc_argument_get_arg_type(args, 3, &tmp_len);
if (tmp) {
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
/* Find kicker's client entry and if not found resolve it */
client_entry2 = silc_client_get_client_by_id(client, conn, client_id);
if (!client_entry2) {
- silc_client_notify_by_server_resolve(client, conn, packet, client_id);
+ silc_client_notify_by_server_resolve(client, conn, packet,
+ SILC_ID_CLIENT, client_id);
goto out;
} else {
if (client_entry2 != conn->local_entry)
if (!tmp)
goto out;
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
/* Get Client ID */
tmp = silc_argument_get_arg_type(args, i + 1, &tmp_len);
if (tmp) {
- client_id = silc_id_payload_parse_id(tmp, tmp_len);
+ client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
if (!client_id)
goto out;
silc_notify_payload_free(payload);
silc_free(client_id);
silc_free(channel_id);
+ silc_free(server_id);
}
projects / silc.git / blobdiff