X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand_reply.c;h=61e4d73a082dea7df0a86f0d6791a9576612b313;hb=52e57c880aba9c5e89f59d962eb9af75670b76e0;hp=bfc114fa7a2b575e37bdc7e9cc3c17f58c697544;hpb=bc742fe07cda767cefc1e541c2794e897044a395;p=silc.git diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c index bfc114fa..61e4d73a 100644 --- a/lib/silcclient/command_reply.c +++ b/lib/silcclient/command_reply.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2006 Pekka Riikonen + Copyright (C) 1997 - 2007 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 @@ -42,7 +42,7 @@ do { \ SILC_LOG_DEBUG(("%s", silc_get_command_name(cmd->cmd))); \ if (cmd->error != SILC_STATUS_OK) { \ if (cmd->verbose) \ - SAY(cmd->conn->client, cmd->conn, SILC_CLIENT_MESSAGE_ERROR, \ + SAY(cmd->conn->client, cmd->conn, SILC_CLIENT_MESSAGE_COMMAND_ERROR, \ msg "%s", silc_get_status_message(cmd->error)); \ ERROR_CALLBACK(cmd->error); \ silc_client_command_process_error(cmd, state_context, cmd->error); \ @@ -127,7 +127,7 @@ static void silc_client_command_process_error(SilcClientCommandContext cmd, if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CHANNEL_ID) { SilcChannelEntry channel; - /* Remove unknown client entry from cache */ + /* Remove unknown channel entry from cache */ if (!silc_argument_get_decoded(args, 2, SILC_ARGUMENT_ID, &id, NULL)) return; @@ -143,7 +143,7 @@ static void silc_client_command_process_error(SilcClientCommandContext cmd, if (cmd->error == SILC_STATUS_ERR_NO_SUCH_SERVER_ID) { SilcServerEntry server_entry; - /* Remove unknown client entry from cache */ + /* Remove unknown server entry from cache */ if (!silc_argument_get_decoded(args, 2, SILC_ARGUMENT_ID, &id, NULL)) return; @@ -199,7 +199,10 @@ SILC_FSM_STATE(silc_client_command_reply) return SILC_FSM_FINISH; } - /* Signal command thread that command reply has arrived */ + /* Signal command thread that command reply has arrived. We continue + command reply processing synchronously because we save the command + payload into state context. No other reply may arrive to this command + while we're processing this reply. */ silc_fsm_set_state_context(&cmd->thread, payload); silc_fsm_next(&cmd->thread, silc_client_command_reply_process); silc_fsm_continue_sync(&cmd->thread); @@ -218,7 +221,7 @@ SILC_FSM_STATE(silc_client_command_reply_wait) /** Wait for command reply */ silc_fsm_set_state_context(fsm, NULL); silc_fsm_next_later(fsm, silc_client_command_reply_timeout, - cmd->cmd != SILC_COMMAND_PING ? 25 : 60, 0); + cmd->cmd != SILC_COMMAND_PING ? 40 : 60, 0); return SILC_FSM_WAIT; } @@ -233,6 +236,8 @@ SILC_FSM_STATE(silc_client_command_reply_timeout) if (conn->internal->disconnected) { SILC_LOG_DEBUG(("Command %s canceled", silc_get_command_name(cmd->cmd))); silc_list_del(conn->internal->pending_commands, cmd); + if (!cmd->called) + ERROR_CALLBACK(SILC_STATUS_ERR_TIMEDOUT); return SILC_FSM_FINISH; } @@ -478,6 +483,8 @@ SILC_FSM_STATE(silc_client_command_reply_whois) nickname, username, realname, mode); } + silc_rwlock_wrlock(client_entry->internal.lock); + if (fingerprint && fingerprint_len == sizeof(client_entry->fingerprint)) memcpy(client_entry->fingerprint, fingerprint, fingerprint_len); @@ -489,6 +496,8 @@ SILC_FSM_STATE(silc_client_command_reply_whois) client_entry->attrs = silc_attribute_payload_parse(tmp, len); } + silc_rwlock_unlock(client_entry->internal.lock); + /* Parse channel and channel user mode list */ if (has_channels) { channel_list = silc_channel_payload_parse_list(silc_buffer_data(&channels), @@ -505,7 +514,7 @@ SILC_FSM_STATE(silc_client_command_reply_whois) silc_client_unref_client(client, conn, client_entry); if (has_channels) { - silc_dlist_uninit(channel_list); + silc_channel_payload_list_free(channel_list); silc_free(umodes); } @@ -668,7 +677,8 @@ SILC_FSM_STATE(silc_client_command_reply_identify) } /* Notify application */ - silc_client_command_callback(cmd, channel_entry, name, info); + silc_client_command_callback(cmd, channel_entry, + channel_entry->channel_name, info); silc_client_unref_channel(client, conn, channel_entry); break; } @@ -716,14 +726,19 @@ SILC_FSM_STATE(silc_client_command_reply_nick) goto out; } + silc_rwlock_wrlock(conn->local_entry->internal.lock); + /* Change the nickname */ old_client_id = *conn->local_id; if (!silc_client_change_nickname(client, conn, conn->local_entry, nick, &id.u.client_id, idp, idp_len)) { ERROR_CALLBACK(SILC_STATUS_ERR_BAD_NICKNAME); + silc_rwlock_unlock(conn->local_entry->internal.lock); goto out; } + silc_rwlock_unlock(conn->local_entry->internal.lock); + /* Notify application */ silc_client_command_callback(cmd, conn->local_entry, conn->local_entry->nickname, &old_client_id); @@ -787,7 +802,8 @@ SILC_FSM_STATE(silc_client_command_reply_list) } /* Notify application */ - silc_client_command_callback(cmd, channel_entry, name, topic, usercount); + silc_client_command_callback(cmd, channel_entry, channel_entry->channel_name, + topic, usercount); out: silc_client_unref_channel(client, conn, channel_entry); @@ -828,6 +844,8 @@ SILC_FSM_STATE(silc_client_command_reply_topic) goto out; } + silc_rwlock_wrlock(channel->internal.lock); + /* Take topic */ topic = silc_argument_get_arg_type(args, 3, &len); if (topic) { @@ -835,6 +853,8 @@ SILC_FSM_STATE(silc_client_command_reply_topic) channel->topic = silc_memdup(topic, len); } + silc_rwlock_unlock(channel->internal.lock); + /* Notify application */ silc_client_command_callback(cmd, channel, channel->topic); @@ -922,7 +942,7 @@ SILC_FSM_STATE(silc_client_command_reply_kill) /* Notify application */ silc_client_command_callback(cmd, client_entry); - /* Remove the client from all channels and free it */ + /* Remove the client */ if (client_entry) { silc_client_remove_from_channels(client, conn, client_entry); silc_client_del_client(client, conn, client_entry); @@ -1183,6 +1203,8 @@ SILC_FSM_STATE(silc_client_command_reply_join) } silc_buffer_set(&client_mode_list, tmp, len); + silc_rwlock_wrlock(channel->internal.lock); + /* Add clients we received in the reply to the channel */ for (i = 0; i < list_count; i++) { SilcUInt16 idp_len; @@ -1201,17 +1223,22 @@ SILC_FSM_STATE(silc_client_command_reply_join) /* Get client entry */ client_entry = silc_client_get_client_by_id(client, conn, &id.u.client_id); - if (!client_entry) - continue; - - /* Join client to the channel */ - silc_client_add_to_channel(client, conn, channel, client_entry, mode); + if (client_entry && client_entry->internal.valid) { + /* Join client to the channel */ + silc_rwlock_wrlock(client_entry->internal.lock); + silc_client_add_to_channel(client, conn, channel, client_entry, mode); + silc_rwlock_unlock(client_entry->internal.lock); + } silc_client_unref_client(client, conn, client_entry); - if (!silc_buffer_pull(&client_id_list, idp_len)) + if (!silc_buffer_pull(&client_id_list, idp_len)) { + silc_rwlock_unlock(channel->internal.lock); goto out; - if (!silc_buffer_pull(&client_mode_list, 4)) + } + if (!silc_buffer_pull(&client_mode_list, 4)) { + silc_rwlock_unlock(channel->internal.lock); goto out; + } } /* Get hmac */ @@ -1219,16 +1246,17 @@ SILC_FSM_STATE(silc_client_command_reply_join) if (hmac) { if (!silc_hmac_alloc(hmac, NULL, &channel->internal.hmac)) { if (cmd->verbose) - SAY(client, conn, SILC_CLIENT_MESSAGE_ERROR, + SAY(client, conn, SILC_CLIENT_MESSAGE_COMMAND_ERROR, "Cannot join channel: Unsupported HMAC `%s'", hmac); ERROR_CALLBACK(SILC_STATUS_ERR_UNKNOWN_ALGORITHM); + silc_rwlock_unlock(channel->internal.lock); goto out; } } /* Get channel mode */ - tmp = silc_argument_get_arg_type(args, 5, NULL); - if (tmp) + tmp = silc_argument_get_arg_type(args, 5, &len); + if (tmp && len == 4) SILC_GET32_MSB(mode, tmp); channel->mode = mode; @@ -1265,18 +1293,19 @@ SILC_FSM_STATE(silc_client_command_reply_join) /* Get channel public key list */ tmp = silc_argument_get_arg_type(args, 16, &len); if (tmp) - channel->channel_pubkeys = - silc_argument_list_parse_decoded(tmp, len, SILC_ARGUMENT_PUBLIC_KEY); + silc_client_channel_save_public_keys(channel, tmp, len, FALSE); /* Set current channel */ conn->current_channel = channel; - cipher = (channel->internal.channel_key ? - silc_cipher_get_name(channel->internal.channel_key) : NULL); + silc_rwlock_unlock(channel->internal.lock); + + cipher = (channel->internal.send_key ? + silc_cipher_get_name(channel->internal.send_key) : NULL); silc_hash_table_list(channel->user_list, &htl); /* Notify application */ - silc_client_command_callback(cmd, channel_name, channel, mode, &htl, + silc_client_command_callback(cmd, channel->channel_name, channel, mode, &htl, topic, cipher, hmac, channel->founder_key, channel->channel_pubkeys, channel->user_limit); @@ -1366,7 +1395,9 @@ SILC_FSM_STATE(silc_client_command_reply_umode) } SILC_GET32_MSB(mode, tmp); + silc_rwlock_wrlock(conn->local_entry->internal.lock); conn->local_entry->mode = mode; + silc_rwlock_unlock(conn->local_entry->internal.lock); /* Notify application */ silc_client_command_callback(cmd, mode); @@ -1392,7 +1423,6 @@ SILC_FSM_STATE(silc_client_command_reply_cmode) SilcChannelEntry channel; SilcUInt32 len; SilcPublicKey public_key = NULL; - SilcDList channel_pubkeys = NULL; SilcID id; /* Sanity checks */ @@ -1412,21 +1442,20 @@ SILC_FSM_STATE(silc_client_command_reply_cmode) goto out; } + /* Get founder public key */ + tmp = silc_argument_get_arg_type(args, 4, &len); + if (tmp) + silc_public_key_payload_decode(tmp, len, &public_key); + /* Get channel mode */ tmp = silc_argument_get_arg_type(args, 3, &len); if (!tmp || len != 4) { ERROR_CALLBACK(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); goto out; } - - /* Save the mode */ SILC_GET32_MSB(mode, tmp); - channel->mode = mode; - /* Get founder public key */ - tmp = silc_argument_get_arg_type(args, 4, &len); - if (tmp) - silc_public_key_payload_decode(tmp, len, &public_key); + silc_rwlock_wrlock(channel->internal.lock); /* Get user limit */ tmp = silc_argument_get_arg_type(args, 6, &len); @@ -1438,14 +1467,18 @@ SILC_FSM_STATE(silc_client_command_reply_cmode) /* Get channel public key(s) */ tmp = silc_argument_get_arg_type(args, 5, &len); if (tmp) - channel_pubkeys = - silc_argument_list_parse_decoded(tmp, len, SILC_ARGUMENT_PUBLIC_KEY); + silc_client_channel_save_public_keys(channel, tmp, len, FALSE); + else if (channel->mode & SILC_CHANNEL_MODE_CHANNEL_AUTH) + silc_client_channel_save_public_keys(channel, NULL, 0, TRUE); + + /* Save the mode */ + channel->mode = mode; + + silc_rwlock_unlock(channel->internal.lock); /* Notify application */ silc_client_command_callback(cmd, channel, mode, public_key, - channel_pubkeys, channel->user_limit); - - silc_argument_list_free(channel_pubkeys, SILC_ARGUMENT_PUBLIC_KEY); + channel->channel_pubkeys, channel->user_limit); out: if (public_key) @@ -1511,9 +1544,11 @@ SILC_FSM_STATE(silc_client_command_reply_cumode) } /* Save the mode */ + silc_rwlock_wrlock(channel->internal.lock); chu = silc_client_on_channel(channel, client_entry); if (chu) chu->mode = mode; + silc_rwlock_unlock(channel->internal.lock); /* Notify application */ silc_client_command_callback(cmd, mode, channel, client_entry); @@ -1590,6 +1625,9 @@ SILC_FSM_STATE(silc_client_command_reply_silcoper) CHECK_STATUS("Cannot change mode: "); CHECK_ARGS(1, 1); + /* Set user mode */ + cmd->conn->local_entry->mode |= SILC_UMODE_ROUTER_OPERATOR; + /* Notify application */ silc_client_command_callback(cmd); @@ -1609,6 +1647,9 @@ SILC_FSM_STATE(silc_client_command_reply_oper) CHECK_STATUS("Cannot change mode: "); CHECK_ARGS(1, 1); + /* Set user mode */ + cmd->conn->local_entry->mode |= SILC_UMODE_SERVER_OPERATOR; + /* Notify application */ silc_client_command_callback(cmd); @@ -1814,7 +1855,7 @@ SILC_FSM_STATE(silc_client_command_reply_users) SilcUInt16 idp_len, mode; SilcHashTableList htl; SilcBufferStruct client_id_list, client_mode_list; - SilcChannelEntry channel; + SilcChannelEntry channel = NULL; SilcClientEntry client_entry; SilcID id; int i; @@ -1858,6 +1899,7 @@ SILC_FSM_STATE(silc_client_command_reply_users) /* Resolve users we do not know about */ if (!cmd->resolved) { cmd->resolved = TRUE; + silc_client_unref_channel(client, conn, channel); SILC_FSM_CALL(silc_client_get_clients_by_list( client, conn, list_count, &client_id_list, silc_client_command_reply_users_resolved, cmd)); @@ -1874,6 +1916,8 @@ SILC_FSM_STATE(silc_client_command_reply_users) SILC_LOG_DEBUG(("channel %s, %d users", channel->channel_name, list_count)); + silc_rwlock_wrlock(channel->internal.lock); + /* Cache the received Client ID's and modes. */ for (i = 0; i < list_count; i++) { SILC_GET16_MSB(idp_len, client_id_list.data + 2); @@ -1887,22 +1931,32 @@ SILC_FSM_STATE(silc_client_command_reply_users) /* Save the client on this channel. Unknown clients are ignored as they clearly do not exist since the resolving didn't find them. */ client_entry = silc_client_get_client_by_id(client, conn, &id.u.client_id); - if (client_entry) + if (client_entry && client_entry->internal.valid) { + silc_rwlock_wrlock(client_entry->internal.lock); silc_client_add_to_channel(client, conn, channel, client_entry, mode); + silc_rwlock_unlock(client_entry->internal.lock); + } silc_client_unref_client(client, conn, client_entry); - if (!silc_buffer_pull(&client_id_list, idp_len)) + if (!silc_buffer_pull(&client_id_list, idp_len)) { + silc_rwlock_unlock(channel->internal.lock); goto out; - if (!silc_buffer_pull(&client_mode_list, 4)) + } + if (!silc_buffer_pull(&client_mode_list, 4)) { + silc_rwlock_unlock(channel->internal.lock); goto out; + } } + silc_rwlock_unlock(channel->internal.lock); + /* Notify application */ silc_hash_table_list(channel->user_list, &htl); silc_client_command_callback(cmd, channel, &htl); silc_hash_table_list_reset(&htl); out: + silc_client_unref_channel(client, conn, channel); silc_fsm_next(fsm, silc_client_command_reply_processed); return SILC_FSM_CONTINUE; } @@ -1955,6 +2009,8 @@ SILC_FSM_STATE(silc_client_command_reply_getkey) goto out; } + silc_rwlock_wrlock(client_entry->internal.lock); + /* Save fingerprint */ if (!client_entry->fingerprint) silc_hash_make(conn->internal->sha1hash, tmp + 4, len - 4, @@ -1964,6 +2020,8 @@ SILC_FSM_STATE(silc_client_command_reply_getkey) public_key = NULL; } + silc_rwlock_unlock(client_entry->internal.lock); + /* Notify application */ silc_client_command_callback(cmd, SILC_ID_CLIENT, client_entry, client_entry->public_key); @@ -1976,11 +2034,15 @@ SILC_FSM_STATE(silc_client_command_reply_getkey) goto out; } + silc_rwlock_wrlock(server_entry->internal.lock); + if (!server_entry->public_key) { server_entry->public_key = public_key; public_key = NULL; } + silc_rwlock_unlock(server_entry->internal.lock); + /* Notify application */ silc_client_command_callback(cmd, SILC_ID_SERVER, server_entry, server_entry->public_key);