X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcclient%2Fcommand_reply.c;h=0ae2890bf8c233eee94188c01c2014e99e75a909;hp=ddb4b0d34ff8a8928818719b8d0b7c52cb9b0523;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=2946cbec7d9cb8448ec01a270399960a1be195eb diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c index ddb4b0d3..0ae2890b 100644 --- a/lib/silcclient/command_reply.c +++ b/lib/silcclient/command_reply.c @@ -39,14 +39,36 @@ #define SAY cmd->client->internal->ops->say /* All functions that call the COMMAND_CHECK_STATUS macro must have - out: goto label. */ + out: and err: goto labels. out label should call the pending + command replies, and the err label just handle error condition. */ #define COMMAND_CHECK_STATUS \ do { \ SILC_LOG_DEBUG(("Start")); \ if (!silc_command_get_status(cmd->payload, NULL, NULL)) { \ + if (SILC_STATUS_IS_ERROR(cmd->status)) { \ + /* Single error */ \ + COMMAND_REPLY_ERROR; \ + goto out; \ + } \ + /* List of errors */ \ COMMAND_REPLY_ERROR; \ - goto out; \ + if (cmd->status == SILC_STATUS_LIST_END) \ + goto out; \ + goto err; \ + } \ +} while(0) + +/* Same as COMMAND_CHECK_STATUS but doesn't call client operation */ +#define COMMAND_CHECK_STATUS_I \ +do { \ + SILC_LOG_DEBUG(("Start")); \ + if (!silc_command_get_status(cmd->payload, NULL, NULL)) { \ + if (SILC_STATUS_IS_ERROR(cmd->status)) \ + goto out; \ + if (cmd->status == SILC_STATUS_LIST_END) \ + goto out; \ + goto err; \ } \ } while(0) @@ -74,6 +96,7 @@ void silc_client_command_reply_process(SilcClient client, /* Allocate command reply context. This must be free'd by the command reply routine receiving it. */ ctx = silc_calloc(1, sizeof(*ctx)); + ctx->users++; ctx->client = client; ctx->sock = sock; ctx->payload = payload; @@ -112,11 +135,26 @@ void silc_client_command_reply_process(SilcClient client, } } +/* Duplicate Command Reply Context by adding reference counter. The context + won't be free'd untill it hits zero. */ + +SilcClientCommandReplyContext +silc_client_command_reply_dup(SilcClientCommandReplyContext cmd) +{ + cmd->users++; + SILC_LOG_DEBUG(("Command reply context %p refcnt %d->%d", cmd, + cmd->users - 1, cmd->users)); + return cmd; +} + /* Free command reply context and its internals. */ void silc_client_command_reply_free(SilcClientCommandReplyContext cmd) { - if (cmd) { + cmd->users--; + SILC_LOG_DEBUG(("Command reply context %p refcnt %d->%d", cmd, + cmd->users + 1, cmd->users)); + if (cmd->users < 1) { silc_command_payload_free(cmd->payload); silc_free(cmd); } @@ -203,14 +241,22 @@ silc_client_command_reply_whois_save(SilcClientCommandReplyContext cmd, client_entry->fingerprint_len = fingerprint_len; } - if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) - client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; + /* Take Requested Attributes if set. */ + tmp = silc_argument_get_arg_type(cmd->args, 11, &len); + if (tmp) { + if (client_entry->attrs) + silc_attribute_payload_list_free(client_entry->attrs); + client_entry->attrs = silc_attribute_payload_parse(tmp, len); + } + + client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; /* 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)); + fingerprint, has_user_modes ? &ch_user_modes : NULL, + client_entry->attrs)); } /* Received reply for WHOIS command. This maybe called several times @@ -236,6 +282,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); + err: /* If we received notify for invalid ID we'll remove the ID if we have it cached. */ if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { @@ -301,7 +348,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) /* 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 && @@ -312,6 +359,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whowas) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOWAS); + err: silc_client_command_reply_free(cmd); } @@ -370,12 +418,11 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, name, info, NULL, 0); } - if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) - client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; + client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING; /* Notify application */ if (notify) - COMMAND_REPLY((ARGS, client_entry, name, info)); + COMMAND_REPLY((SILC_ARGS, client_entry, name, info)); break; case SILC_ID_SERVER: @@ -394,11 +441,15 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, COMMAND_REPLY_ERROR; return; } + } else { + silc_client_update_server(client, conn, server_entry, name, info); } + server_entry->resolve_cmd_ident = 0; + /* Notify application */ if (notify) - COMMAND_REPLY((ARGS, server_entry, name, info)); + COMMAND_REPLY((SILC_ARGS, server_entry, name, info)); break; case SILC_ID_CHANNEL: @@ -420,7 +471,7 @@ silc_client_command_reply_identify_save(SilcClientCommandReplyContext cmd, /* Notify application */ if (notify) - COMMAND_REPLY((ARGS, channel_entry, name, info)); + COMMAND_REPLY((SILC_ARGS, channel_entry, name, info)); break; } @@ -454,6 +505,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY); + err: /* If we received notify for invalid ID we'll remove the ID if we have it cached. */ if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { @@ -518,18 +570,19 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick) /* 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); @@ -587,7 +640,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(list) } /* 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 && @@ -599,6 +652,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(list) out: silc_free(channel_id); SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LIST); + err: silc_client_command_reply_free(cmd); } @@ -650,7 +704,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic) } /* Notify application */ - COMMAND_REPLY((ARGS, channel, topic)); + COMMAND_REPLY((SILC_ARGS, channel, topic)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC); @@ -667,6 +721,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) SilcChannelID *channel_id; unsigned char *tmp; SilcUInt32 len; + SilcBufferStruct buf; if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, @@ -694,9 +749,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite) /* 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); @@ -718,7 +775,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(kill) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KILL); @@ -778,7 +835,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) } /* 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); @@ -786,6 +843,38 @@ SILC_CLIENT_CMD_REPLY_FUNC(info) silc_client_command_reply_free(cmd); } +/* Received reply to STATS command. */ + +SILC_CLIENT_CMD_REPLY_FUNC(stats) +{ + SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; + SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + unsigned char *tmp, *buf = NULL; + SilcUInt32 len, buf_len = 0; + + if (cmd->error != SILC_STATUS_OK) { + SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, + "%s", silc_get_status_message(cmd->error)); + COMMAND_REPLY_ERROR; + goto out; + } + + /* Get server ID */ + tmp = silc_argument_get_arg_type(cmd->args, 2, &len); + if (!tmp) + goto out; + + /* Get statistics structure */ + buf = silc_argument_get_arg_type(cmd->args, 3, &buf_len); + + /* Notify application */ + COMMAND_REPLY((SILC_ARGS, buf, buf_len)); + + out: + SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_STATS); + silc_client_command_reply_free(cmd); +} + /* Received reply to PING command. The reply time is shown to user. */ SILC_CLIENT_CMD_REPLY_FUNC(ping) @@ -806,26 +895,26 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) 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; } } @@ -833,7 +922,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping) silc_free(id); /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING); @@ -865,7 +954,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) } argc = silc_argument_get_arg_num(cmd->args); - if (argc < 7 || argc > 14) { + if (argc < 7) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, "Cannot join channel: Bad reply packet"); COMMAND_REPLY_ERROR; @@ -1010,7 +1099,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(join) 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)); @@ -1061,7 +1150,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) while(cp[i] != 0) { if (cp[i++] == '\n') { memset(line, 0, sizeof(line)); - strncat(line, cp, i - 1); + silc_strncat(line, sizeof(line), cp, i - 1); cp += i; if (i == 2) @@ -1077,7 +1166,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd) } /* Notify application */ - COMMAND_REPLY((ARGS, motd)); + COMMAND_REPLY((SILC_ARGS, motd)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD); @@ -1110,7 +1199,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(umode) 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); @@ -1151,7 +1240,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) COMMAND_REPLY_ERROR; goto out; } - + /* Get channel mode */ tmp = silc_argument_get_arg_type(cmd->args, 3, NULL); if (!tmp) { @@ -1165,7 +1254,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode) channel->mode = mode; /* Notify application */ - COMMAND_REPLY((ARGS, channel, mode)); + COMMAND_REPLY((SILC_ARGS, channel, mode)); silc_free(channel_id); @@ -1248,7 +1337,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode) 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); @@ -1270,7 +1359,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(kick) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK); @@ -1290,7 +1379,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(silcoper) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_SILCOPER); @@ -1310,7 +1399,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(oper) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_OPER); @@ -1331,7 +1420,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(detach) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); /* Generate the detachment data and deliver it to the client in the detach client operation */ @@ -1360,7 +1449,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(watch) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WATCH); @@ -1375,6 +1464,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(ban) SilcChannelID *channel_id; unsigned char *tmp; SilcUInt32 len; + SilcBufferStruct buf; if (cmd->error != SILC_STATUS_OK) { SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR, @@ -1402,9 +1492,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(ban) /* 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); @@ -1448,7 +1540,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(leave) } /* Notify application */ - COMMAND_REPLY((ARGS, channel)); + COMMAND_REPLY((SILC_ARGS, channel)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE); @@ -1568,22 +1660,6 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, /* Check if we have this client cached already. */ client_entry = silc_client_get_client_by_id(cmd->client, conn, client_id); if (!client_entry || !client_entry->username || !client_entry->realname) { - if (client_entry) { - if (client_entry->status & SILC_CLIENT_STATUS_RESOLVING) { - /* Attach to this resolving and wait until it finishes */ - silc_client_command_pending(conn, SILC_COMMAND_NONE, - client_entry->resolve_cmd_ident, - get_clients, cmd); - wait_res = TRUE; - - silc_buffer_pull(&client_id_list, idp_len); - silc_buffer_pull(&client_mode_list, 4); - continue; - } - client_entry->status |= SILC_CLIENT_STATUS_RESOLVING; - client_entry->resolve_cmd_ident = conn->cmd_ident + 1; - } - /* 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. */ @@ -1595,7 +1671,7 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, (res_argc + 1)); res_argv[res_argc] = client_id_list.data; res_argv_lens[res_argc] = idp_len; - res_argv_types[res_argc] = res_argc + 3; + res_argv_types[res_argc] = res_argc + 4; res_argc++; } else { if (!silc_client_on_channel(channel, client_entry)) { @@ -1653,7 +1729,7 @@ silc_client_command_reply_users_save(SilcClientCommandReplyContext cmd, /* 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: @@ -1668,6 +1744,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; + SilcClientCommandReplyContext r = (SilcClientCommandReplyContext)context2; SILC_LOG_DEBUG(("Start")); @@ -1678,6 +1755,13 @@ SILC_CLIENT_CMD_REPLY_FUNC(users) 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)) @@ -1700,10 +1784,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) 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; @@ -1730,15 +1812,9 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) /* 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) { @@ -1750,8 +1826,16 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) 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); @@ -1762,7 +1846,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(getkey) } /* Notify application */ - COMMAND_REPLY((ARGS, id_type, server_entry, public_key)); + COMMAND_REPLY((SILC_ARGS, id_type, server_entry, public_key)); } out: @@ -1793,10 +1877,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois_i) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SILC_LOG_DEBUG(("Start")); - - if (cmd->error != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Save WHOIS info */ silc_client_command_reply_whois_save(cmd, cmd->status, FALSE); @@ -1811,6 +1892,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois_i) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS); + err: /* If we received notify for invalid ID we'll remove the ID if we have it cached. */ if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { @@ -1844,10 +1926,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify_i) SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data; - SILC_LOG_DEBUG(("Start")); - - if (cmd->error != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Save IDENTIFY info */ silc_client_command_reply_identify_save(cmd, cmd->status, FALSE); @@ -1862,6 +1941,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify_i) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY); + err: /* If we received notify for invalid ID we'll remove the ID if we have it cached. */ if (cmd->error == SILC_STATUS_ERR_NO_SUCH_CLIENT_ID) { @@ -1900,10 +1980,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(info_i) char *server_name, *server_info; SilcUInt32 len; - SILC_LOG_DEBUG(("Start")); - - if (cmd->error != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Get server ID */ tmp = silc_argument_get_arg_type(cmd->args, 2, &len); @@ -1935,6 +2012,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(info_i) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO); silc_free(server_id); + err: silc_client_command_reply_free(cmd); } @@ -1964,10 +2042,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users_i) { SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context; - SILC_LOG_DEBUG(("Start")); - - if (cmd->error != SILC_STATUS_OK) - goto out; + COMMAND_CHECK_STATUS_I; /* Save USERS info */ if (silc_client_command_reply_users_save( @@ -1979,6 +2054,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users_i) out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS); + err: /* Unregister this command reply */ silc_client_command_unregister(cmd->client, SILC_COMMAND_USERS, NULL, silc_client_command_reply_users_i, @@ -2003,7 +2079,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(connect) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CONNECT); @@ -2023,7 +2099,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(close) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_CLOSE); @@ -2043,7 +2119,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(shutdown) } /* Notify application */ - COMMAND_REPLY((ARGS)); + COMMAND_REPLY((SILC_ARGS)); out: SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PRIV_SHUTDOWN);