X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fcommand.c;h=9ceb7caaf403e11568a81a0eaffc75e3bdf69b07;hb=2407b5a8d55101dcc4cccb098888e0e21f6f299c;hp=e9ee59679446ce6942d3a17a1944803a7c91246d;hpb=6394d86063413bc1c473723f3ef971840195bcd3;p=silc.git diff --git a/apps/silcd/command.c b/apps/silcd/command.c index e9ee5967..9ceb7caa 100644 --- a/apps/silcd/command.c +++ b/apps/silcd/command.c @@ -131,7 +131,6 @@ static int silc_server_is_registered(SilcServer server, silc_server_command_send_status_reply(cmd, command, SILC_STATUS_ERR_NOT_REGISTERED); - silc_server_command_free(cmd); return FALSE; } @@ -149,6 +148,11 @@ SILC_TASK_CALLBACK(silc_server_command_process_timeout) SilcServerCommandTimeout timeout = (SilcServerCommandTimeout)context; SilcClientEntry client = (SilcClientEntry)timeout->ctx->sock->user_data; + if (!client) { + silc_server_command_free(timeout->ctx); + silc_free(timeout); + } + /* Update access time */ client->last_command = time(NULL); @@ -159,6 +163,8 @@ SILC_TASK_CALLBACK(silc_server_command_process_timeout) timeout->ctx, timeout->cmd->cmd)) timeout->cmd->cb(timeout->ctx, NULL); + else + silc_server_command_free(timeout->ctx); silc_free(timeout); } @@ -233,15 +239,12 @@ void silc_server_command_process(SilcServer server, silc_server_command_process_timeout, (void *)timeout, 2 - (time(NULL) - client->last_command), 0, - SILC_TASK_TIMEOUT, - SILC_TASK_PRI_NORMAL); + SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); else silc_schedule_task_add(server->schedule, sock->sock, silc_server_command_process_timeout, - (void *)timeout, - 0, 1, - SILC_TASK_TIMEOUT, - SILC_TASK_PRI_NORMAL); + (void *)timeout, 0, 1, + SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); return; } @@ -251,6 +254,8 @@ void silc_server_command_process(SilcServer server, cmd->cb(ctx, NULL); else if (silc_server_is_registered(server, sock, ctx, cmd->cmd)) cmd->cb(ctx, NULL); + else + silc_server_command_free(ctx); } /* Allocate Command Context */ @@ -297,24 +302,36 @@ silc_server_command_dup(SilcServerCommandContext ctx) with `context' when reply has been received. It can be SILC_COMMAND_NONE to match any command with the `ident'. If `ident' is non-zero the `callback' will be executed when received reply with command - identifier `ident'. */ + identifier `ident'. If there already exists pending command for the + specified command, ident, callback and context this function has no + effect. */ -void silc_server_command_pending(SilcServer server, +bool silc_server_command_pending(SilcServer server, SilcCommand reply_cmd, uint16 ident, - SilcServerPendingDestructor destructor, SilcCommandCb callback, void *context) { SilcServerCommandPending *reply; + /* Check whether identical pending already exists for same command, + ident, callback and callback context. If it does then it would be + error to register it again. */ + silc_dlist_start(server->pending_commands); + while ((reply = silc_dlist_get(server->pending_commands)) != SILC_LIST_END) { + if (reply->reply_cmd == reply_cmd && reply->ident == ident && + reply->callback == callback && reply->context == context) + return FALSE; + } + reply = silc_calloc(1, sizeof(*reply)); reply->reply_cmd = reply_cmd; reply->ident = ident; reply->context = context; reply->callback = callback; - reply->destructor = destructor; silc_dlist_add(server->pending_commands, reply); + + return TRUE; } /* Deletes pending command by reply command type. */ @@ -355,7 +372,6 @@ silc_server_command_pending_check(SilcServer server, callbacks = silc_realloc(callbacks, sizeof(*callbacks) * (i + 1)); callbacks[i].context = r->context; callbacks[i].callback = r->callback; - callbacks[i].destructor = r->destructor; ctx->ident = ident; i++; } @@ -365,14 +381,6 @@ silc_server_command_pending_check(SilcServer server, return callbacks; } -/* Destructor function for pending callbacks. This is called when using - pending commands to free the context given for the pending command. */ - -static void silc_server_command_destructor(void *context) -{ - silc_server_command_free((SilcServerCommandContext)context); -} - /* Sends simple status message as command reply packet */ static void @@ -495,6 +503,8 @@ silc_server_command_whois_parse(SilcServerCommandContext cmd, (*client_id)[0] = silc_id_payload_parse_id(tmp, len); if ((*client_id)[0] == NULL) { silc_free(*client_id); + silc_server_command_send_status_reply(cmd, command, + SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); return FALSE; } *client_id_count = 1; @@ -512,6 +522,9 @@ silc_server_command_whois_parse(SilcServerCommandContext cmd, for (i = 0; i < *client_id_count; i++) silc_free((*client_id)[i]); silc_free(*client_id); + silc_server_command_send_status_reply( + cmd, command, + SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); return FALSE; } (*client_id_count)++; @@ -553,6 +566,8 @@ silc_server_command_whois_check(SilcServerCommandContext cmd, int i, k; bool no_res = TRUE; + SILC_LOG_DEBUG(("Start")); + for (i = 0; i < clients_count; i++) { entry = clients[i]; if (!entry) @@ -579,7 +594,6 @@ silc_server_command_whois_check(SilcServerCommandContext cmd, to the command reply and we're done with this one. */ silc_server_command_pending(server, SILC_COMMAND_NONE, entry->resolve_cmd_ident, - silc_server_command_destructor, silc_server_command_whois, silc_server_command_dup(cmd)); no_res = FALSE; @@ -662,7 +676,6 @@ silc_server_command_whois_check(SilcServerCommandContext cmd, /* Reprocess this packet after received reply */ silc_server_command_pending(server, SILC_COMMAND_WHOIS, r->ident, - silc_server_command_destructor, silc_server_command_whois, silc_server_command_dup(cmd)); cmd->pending = TRUE; @@ -736,17 +749,6 @@ silc_server_command_whois_send_reply(SilcServerCommandContext cmd, if (!entry) continue; -#if 1 - /* XXX REMOVE */ - /* Sanity check, however these should never fail. However, as - this sanity check has been added here they have failed. */ - if (!entry->nickname || !entry->username || !entry->userinfo) { - SILC_LOG_ERROR(("********* if (!entry->nickname || !entry->username " - "|| !entry->userinfo) triggered: should have not!")); - continue; - } -#endif - if (k >= 1) status = SILC_STATUS_LIST_ITEM; if (valid_count > 1 && k == valid_count - 1) @@ -843,7 +845,6 @@ silc_server_command_whois_send_router(SilcServerCommandContext cmd) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_WHOIS, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_whois, silc_server_command_dup(cmd)); cmd->pending = TRUE; @@ -993,9 +994,7 @@ SILC_SERVER_CMD_FUNC(whois) SILC_SERVER_COMMAND_CHECK(SILC_COMMAND_WHOIS, cmd, 1, 3328); ret = silc_server_command_whois_process(cmd); - - if (!ret) - silc_server_command_free(cmd); + silc_server_command_free(cmd); } /****************************************************************************** @@ -1064,11 +1063,9 @@ silc_server_command_whowas_check(SilcServerCommandContext cmd, /* Reprocess this packet after received reply */ silc_server_command_pending(server, SILC_COMMAND_WHOWAS, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_whowas, silc_server_command_dup(cmd)); cmd->pending = TRUE; - silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); @@ -1117,25 +1114,6 @@ silc_server_command_whowas_send_reply(SilcServerCommandContext cmd, if (clients_count > 1 && i == clients_count - 1) status = SILC_STATUS_LIST_END; - /* Sanity check, however these should never fail. However, as - this sanity check has been added here they have failed. */ - if (!entry->nickname || !entry->username || !entry->userinfo) { - SILC_LOG_ERROR(("********* if (!entry->nickname || !entry->username " - "|| !entry->userinfo) triggered: should have not!")); - continue; - } - -#if 1 - /* XXX REMOVE */ - /* Sanity check, however these should never fail. However, as - this sanity check has been added here they have failed. */ - if (!entry->nickname || !entry->username) { - SILC_LOG_ERROR(("********* if (!entry->nickname || !entry->username) " - "triggered: should have not!")); - continue; - } -#endif - /* Send WHOWAS reply */ idp = silc_id_payload_encode(entry->id, SILC_ID_CLIENT); tmp = silc_argument_get_first_arg(cmd->args, NULL); @@ -1218,11 +1196,9 @@ silc_server_command_whowas_process(SilcServerCommandContext cmd) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_WHOWAS, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_whowas, silc_server_command_dup(cmd)); cmd->pending = TRUE; - silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); @@ -1280,7 +1256,6 @@ silc_server_command_whowas_process(SilcServerCommandContext cmd) silc_free(clients); silc_free(nick); silc_free(server_name); - return ret; } @@ -1294,9 +1269,7 @@ SILC_SERVER_CMD_FUNC(whowas) SILC_SERVER_COMMAND_CHECK(SILC_COMMAND_WHOWAS, cmd, 1, 2); ret = silc_server_command_whowas_process(cmd); - - if (!ret) - silc_server_command_free(cmd); + silc_server_command_free(cmd); } /****************************************************************************** @@ -1325,7 +1298,6 @@ silc_server_command_identify_send_router(SilcServerCommandContext cmd) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_IDENTIFY, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_identify, silc_server_command_dup(cmd)); cmd->pending = TRUE; @@ -1643,7 +1615,6 @@ silc_server_command_identify_check_client(SilcServerCommandContext cmd, to the command reply and we're done with this one. */ silc_server_command_pending(server, SILC_COMMAND_NONE, entry->resolve_cmd_ident, - silc_server_command_destructor, silc_server_command_identify, silc_server_command_dup(cmd)); no_res = FALSE; @@ -1726,7 +1697,6 @@ silc_server_command_identify_check_client(SilcServerCommandContext cmd, /* Reprocess this packet after received reply */ silc_server_command_pending(server, SILC_COMMAND_WHOIS, r->ident, - silc_server_command_destructor, silc_server_command_identify, silc_server_command_dup(cmd)); cmd->pending = TRUE; @@ -1796,7 +1766,7 @@ silc_server_command_identify_send_reply(SilcServerCommandContext cmd, /* Process all valid client entries and send command replies */ - if (len > 1) + if (valid_count > 1) status = SILC_STATUS_LIST_START; for (i = 0, k = 0; i < clients_count; i++) { @@ -1956,6 +1926,7 @@ silc_server_command_identify_process(SilcServerCommandContext cmd) &count); if (ret < 1) return ret; + ret = 0; /* Check that all mandatory fields are present and request those data from the server who owns the client if necessary. */ @@ -1987,28 +1958,7 @@ SILC_SERVER_CMD_FUNC(identify) SILC_SERVER_COMMAND_CHECK(SILC_COMMAND_IDENTIFY, cmd, 1, 3328); ret = silc_server_command_identify_process(cmd); - - if (!ret) - silc_server_command_free(cmd); -} - -/* Checks string for bad characters and returns TRUE if they are found. */ - -static int silc_server_command_bad_chars(char *nick) -{ - int i; - - for (i = 0; i < strlen(nick); i++) { - if (!isascii(nick[i])) - return TRUE; - if (nick[i] <= 32) return TRUE; - if (nick[i] == ' ') return TRUE; - if (nick[i] == '*') return TRUE; - if (nick[i] == '?') return TRUE; - if (nick[i] == ',') return TRUE; - } - - return FALSE; + silc_server_command_free(cmd); } /* Server side of command NICK. Sets nickname for user. Setting @@ -2022,6 +1972,7 @@ SILC_SERVER_CMD_FUNC(nick) SilcServer server = cmd->server; SilcBuffer packet, nidp, oidp = NULL; SilcClientID *new_id; + uint32 nick_len; char *nick; uint16 ident = silc_command_get_ident(cmd->payload); int nickfail = 0; @@ -2032,16 +1983,15 @@ SILC_SERVER_CMD_FUNC(nick) SILC_SERVER_COMMAND_CHECK(SILC_COMMAND_NICK, cmd, 1, 1); /* Check nickname */ - nick = silc_argument_get_arg_type(cmd->args, 1, NULL); - if (silc_server_command_bad_chars(nick) == TRUE) { + nick = silc_argument_get_arg_type(cmd->args, 1, &nick_len); + if (nick_len > 128) + nick[128] = '\0'; + if (silc_server_name_bad_chars(nick, nick_len) == TRUE) { silc_server_command_send_status_reply(cmd, SILC_COMMAND_NICK, SILC_STATUS_ERR_BAD_NICKNAME); goto out; } - if (strlen(nick) > 128) - nick[128] = '\0'; - /* Check for same nickname */ if (!strcmp(client->nickname, nick)) { nidp = silc_id_payload_encode(client->id, SILC_ID_CLIENT); @@ -2118,7 +2068,7 @@ silc_server_command_list_send_reply(SilcServerCommandContext cmd, SilcChannelEntry *gch, uint32 gch_count) { - int i; + int i, k; SilcBuffer packet, idp; SilcChannelEntry entry; SilcCommandStatus status; @@ -2126,27 +2076,34 @@ silc_server_command_list_send_reply(SilcServerCommandContext cmd, char *topic; unsigned char usercount[4]; uint32 users; + int valid_lcount = 0, valid_rcount = 0; - for (i = 0; i < lch_count; i++) + for (i = 0; i < lch_count; i++) { if (lch[i]->mode & SILC_CHANNEL_MODE_SECRET) lch[i] = NULL; - for (i = 0; i < gch_count; i++) + else + valid_lcount++; + } + for (i = 0; i < gch_count; i++) { if (gch[i]->mode & SILC_CHANNEL_MODE_SECRET) gch[i] = NULL; + else + valid_rcount++; + } status = SILC_STATUS_OK; if ((lch_count + gch_count) > 1) status = SILC_STATUS_LIST_START; /* Local list */ - for (i = 0; i < lch_count; i++) { + for (i = 0, k = 0; i < lch_count; i++) { entry = lch[i]; if (!entry) continue; - if (i >= 1) + if (k >= 1) status = SILC_STATUS_LIST_ITEM; - if (i >= 1 && i == lch_count - 1 && !gch_count) + if (valid_lcount > 1 && k == valid_lcount - 1 && !valid_rcount) status = SILC_STATUS_LIST_END; idp = silc_id_payload_encode(entry->id, SILC_ID_CHANNEL); @@ -2174,17 +2131,18 @@ silc_server_command_list_send_reply(SilcServerCommandContext cmd, packet->len, FALSE); silc_buffer_free(packet); silc_buffer_free(idp); + k++; } /* Global list */ - for (i = 0; i < gch_count; i++) { + for (i = 0, k = 0; i < gch_count; i++) { entry = gch[i]; if (!entry) continue; - if (i >= 1) + if (k >= 1) status = SILC_STATUS_LIST_ITEM; - if (i >= 1 && i == gch_count - 1) + if (valid_rcount > 1 && k == valid_rcount - 1) status = SILC_STATUS_LIST_END; idp = silc_id_payload_encode(entry->id, SILC_ID_CHANNEL); @@ -2212,6 +2170,7 @@ silc_server_command_list_send_reply(SilcServerCommandContext cmd, packet->len, FALSE); silc_buffer_free(packet); silc_buffer_free(idp); + k++; } } @@ -2247,13 +2206,12 @@ SILC_SERVER_CMD_FUNC(list) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_LIST, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_list, silc_server_command_dup(cmd)); cmd->pending = TRUE; silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); - return; + goto out; } /* Get Channel ID */ @@ -2379,7 +2337,7 @@ SILC_SERVER_CMD_FUNC(topic) idp = silc_id_payload_encode(client->id, SILC_ID_CLIENT); /* Send notify about topic change to all clients on the channel */ - silc_server_send_notify_to_channel(server, NULL, channel, TRUE, + silc_server_send_notify_to_channel(server, NULL, channel, FALSE, SILC_NOTIFY_TYPE_TOPIC_SET, 2, idp->data, idp->len, channel->topic, strlen(channel->topic)); @@ -2476,6 +2434,7 @@ SILC_SERVER_CMD_FUNC(invite) tmp = silc_argument_get_arg_type(cmd->args, 2, &len); if (tmp) { char invite[512]; + bool resolve; dest_id = silc_id_payload_parse_id(tmp, len); if (!dest_id) { @@ -2485,11 +2444,12 @@ SILC_SERVER_CMD_FUNC(invite) } /* Get the client entry */ - dest = silc_server_get_client_resolve(server, dest_id); + dest = silc_server_get_client_resolve(server, dest_id, &resolve); if (!dest) { - if (server->server_type != SILC_SERVER) { - silc_server_command_send_status_reply(cmd, SILC_COMMAND_INVITE, - SILC_STATUS_ERR_NO_SUCH_CLIENT_ID); + if (server->server_type != SILC_SERVER || !resolve) { + silc_server_command_send_status_reply( + cmd, SILC_COMMAND_INVITE, + SILC_STATUS_ERR_NO_SUCH_CLIENT_ID); goto out; } @@ -2497,13 +2457,12 @@ SILC_SERVER_CMD_FUNC(invite) receiving the reply to the query. */ silc_server_command_pending(server, SILC_COMMAND_WHOIS, server->cmd_ident, - silc_server_command_destructor, silc_server_command_invite, silc_server_command_dup(cmd)); cmd->pending = TRUE; silc_free(channel_id); silc_free(dest_id); - return; + goto out; } /* Check whether the requested client is already on the channel. */ @@ -2703,6 +2662,7 @@ SILC_SERVER_CMD_FUNC(kill) SilcClientID *client_id; unsigned char *tmp, *comment; uint32 tmp_len, tmp_len2; + bool local; SILC_SERVER_COMMAND_CHECK(SILC_COMMAND_KILL, cmd, 1, 2); @@ -2740,9 +2700,11 @@ SILC_SERVER_CMD_FUNC(kill) /* Get the client entry */ remote_client = silc_idlist_find_client_by_id(server->local_list, client_id, TRUE, NULL); + local = TRUE; if (!remote_client) { remote_client = silc_idlist_find_client_by_id(server->global_list, client_id, TRUE, NULL); + local = FALSE; if (!remote_client) { silc_server_command_send_status_reply(cmd, SILC_COMMAND_KILL, SILC_STATUS_ERR_NO_SUCH_CLIENT_ID); @@ -2796,9 +2758,17 @@ SILC_SERVER_CMD_FUNC(kill) silc_server_free_client_data(server, sock, remote_client, FALSE, NULL); silc_server_close_connection(server, sock); } else { + /* Update statistics */ + if (remote_client->connection) + server->stat.my_clients--; + if (server->server_type == SILC_ROUTER) + server->stat.cell_clients--; + SILC_OPER_STATS_UPDATE(remote_client, server, SILC_UMODE_SERVER_OPERATOR); + SILC_OPER_STATS_UPDATE(remote_client, router, SILC_UMODE_ROUTER_OPERATOR); + /* Remove remote client */ - if (!silc_idlist_del_client(server->global_list, remote_client)) - silc_idlist_del_client(server->local_list, remote_client); + silc_idlist_del_client(local ? server->local_list : + server->global_list, remote_client); } out: @@ -2901,13 +2871,12 @@ SILC_SERVER_CMD_FUNC(info) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_INFO, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_info, silc_server_command_dup(cmd)); cmd->pending = TRUE; silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); - return; + goto out; } if (!entry && !cmd->pending && !server->standalone) { @@ -2926,13 +2895,12 @@ SILC_SERVER_CMD_FUNC(info) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_INFO, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_info, silc_server_command_dup(cmd)); cmd->pending = TRUE; silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); - return; + goto out; } } @@ -3031,6 +2999,7 @@ static void silc_server_command_join_channel(SilcServer server, uint16 ident = silc_command_get_ident(cmd->payload); char check[512], check2[512]; bool founder = FALSE; + bool resolve; SILC_LOG_DEBUG(("Start")); @@ -3041,19 +3010,26 @@ static void silc_server_command_join_channel(SilcServer server, if (cmd->sock->type == SILC_SOCKET_TYPE_CLIENT) { client = (SilcClientEntry)sock->user_data; } else { - client = silc_server_get_client_resolve(server, client_id); + client = silc_server_get_client_resolve(server, client_id, &resolve); if (!client) { if (cmd->pending) goto out; + if (!resolve) { + silc_server_command_send_status_reply( + cmd, SILC_COMMAND_JOIN, + SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); + goto out; + } + /* The client info is being resolved. Reprocess this packet after receiving the reply to the query. */ silc_server_command_pending(server, SILC_COMMAND_WHOIS, - server->cmd_ident, NULL, + server->cmd_ident, silc_server_command_join, silc_server_command_dup(cmd)); cmd->pending = TRUE; - return; + goto out; } cmd->pending = FALSE; @@ -3128,8 +3104,7 @@ static void silc_server_command_join_channel(SilcServer server, username and/or hostname is in the ban list the access to the channel is denied. */ if (channel->ban_list) { - if (!channel->ban_list || - silc_string_match(channel->ban_list, check) || + if (silc_string_match(channel->ban_list, check) || silc_string_match(channel->ban_list, check2)) { silc_server_command_send_status_reply( cmd, SILC_COMMAND_JOIN, @@ -3159,8 +3134,7 @@ static void silc_server_command_join_channel(SilcServer server, } if (!passphrase || !channel->passphrase || - memcmp(channel->passphrase, passphrase, - strlen(channel->passphrase))) { + memcmp(passphrase, channel->passphrase, strlen(channel->passphrase))) { silc_server_command_send_status_reply(cmd, SILC_COMMAND_JOIN, SILC_STATUS_ERR_BAD_PASSWORD); goto out; @@ -3335,10 +3309,10 @@ SILC_SERVER_CMD_FUNC(join) } channel_name = tmp; - if (strlen(channel_name) > 256) + if (tmp_len > 256) channel_name[255] = '\0'; - if (silc_server_command_bad_chars(channel_name) == TRUE) { + if (silc_server_name_bad_chars(channel_name, tmp_len) == TRUE) { silc_server_command_send_status_reply(cmd, SILC_COMMAND_JOIN, SILC_STATUS_ERR_BAD_CHANNEL); goto out; @@ -3368,16 +3342,8 @@ SILC_SERVER_CMD_FUNC(join) channel_name, NULL); if (cmd->sock->type == SILC_SOCKET_TYPE_CLIENT) { - /* If this is coming from client the Client ID in the command packet must - be same as the client's ID. */ - if (cmd->sock->type == SILC_SOCKET_TYPE_CLIENT) { - SilcClientEntry entry = (SilcClientEntry)cmd->sock->user_data; - if (!SILC_ID_CLIENT_COMPARE(entry->id, client_id)) { - silc_server_command_send_status_reply(cmd, SILC_COMMAND_JOIN, - SILC_STATUS_ERR_NOT_ENOUGH_PARAMS); - goto out; - } - } + SilcClientEntry entry = (SilcClientEntry)cmd->sock->user_data; + client_id = silc_id_dup(entry->id, SILC_ID_CLIENT); if (!channel || channel->disabled) { /* Channel not found */ @@ -3388,8 +3354,9 @@ SILC_SERVER_CMD_FUNC(join) channel = silc_server_create_new_channel(server, server->id, cipher, hmac, channel_name, TRUE); if (!channel) { - silc_server_command_send_status_reply(cmd, SILC_COMMAND_JOIN, - SILC_STATUS_ERR_UNKNOWN_ALGORITHM); + silc_server_command_send_status_reply( + cmd, SILC_COMMAND_JOIN, + SILC_STATUS_ERR_UNKNOWN_ALGORITHM); goto out; } @@ -3426,11 +3393,11 @@ SILC_SERVER_CMD_FUNC(join) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_JOIN, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_join, silc_server_command_dup(cmd)); cmd->pending = TRUE; - return; + silc_command_set_ident(cmd->payload, old_ident); + goto out; } /* We are router and the channel does not seem exist so we will check @@ -3489,11 +3456,17 @@ SILC_SERVER_CMD_FUNC(join) if (cmd->pending && context2) { SilcServerCommandReplyContext reply = (SilcServerCommandReplyContext)context2; + if (silc_command_get(reply->payload) == SILC_COMMAND_JOIN) { tmp = silc_argument_get_arg_type(reply->args, 6, NULL); SILC_GET32_MSB(created, tmp); - create_key = FALSE; /* Router returned the key already */ + if (silc_argument_get_arg_type(reply->args, 7, NULL) + create_key = FALSE; /* Router returned the key already */ } + + if (silc_command_get(reply->payload) == SILC_COMMAND_WHOIS && + !silc_hash_table_count(channel->user_list)) + created = TRUE; } /* If the channel does not have global users and is also empty the client @@ -3590,13 +3563,12 @@ SILC_SERVER_CMD_FUNC(motd) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_MOTD, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_motd, silc_server_command_dup(cmd)); cmd->pending = TRUE; silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); - return; + goto out; } if (!entry && !cmd->pending && !server->standalone) { @@ -3615,13 +3587,12 @@ SILC_SERVER_CMD_FUNC(motd) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_MOTD, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_motd, silc_server_command_dup(cmd)); cmd->pending = TRUE; silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); - return; + goto out; } if (!entry) { @@ -3687,9 +3658,14 @@ SILC_SERVER_CMD_FUNC(umode) goto out; } } else { - if (client->mode & SILC_UMODE_SERVER_OPERATOR) - /* Remove the server operator rights */ + /* Remove the server operator rights */ + if (client->mode & SILC_UMODE_SERVER_OPERATOR) { client->mode &= ~SILC_UMODE_SERVER_OPERATOR; + if (client->connection) + server->stat.my_server_ops--; + if (server->server_type == SILC_ROUTER) + server->stat.server_ops--; + } } if (mask & SILC_UMODE_ROUTER_OPERATOR) { @@ -3700,9 +3676,14 @@ SILC_SERVER_CMD_FUNC(umode) goto out; } } else { - if (client->mode & SILC_UMODE_ROUTER_OPERATOR) - /* Remove the router operator rights */ + /* Remove the router operator rights */ + if (client->mode & SILC_UMODE_ROUTER_OPERATOR) { client->mode &= ~SILC_UMODE_ROUTER_OPERATOR; + if (client->connection) + server->stat.my_router_ops--; + if (server->server_type == SILC_ROUTER) + server->stat.router_ops--; + } } if (mask & SILC_UMODE_GONE) { @@ -3885,22 +3866,22 @@ SILC_SERVER_CMD_FUNC(cmode) /* The mode is removed and we need to generate and distribute new channel key. Clients are not using private channel keys anymore after this. */ - + /* Re-generate channel key */ if (!silc_server_create_channel_key(server, channel, 0)) goto out; - + /* Send the channel key. This sends it to our local clients and if we are normal server to our router as well. */ silc_server_send_channel_key(server, NULL, channel, server->server_type == SILC_ROUTER ? FALSE : !server->standalone); - + cipher = channel->channel_key->cipher->name; hmac = (char *)silc_hmac_get_name(channel->hmac); } } - + if (mode_mask & SILC_CHANNEL_MODE_ULIMIT) { /* User limit is set on channel */ uint32 user_limit; @@ -4299,9 +4280,9 @@ SILC_SERVER_CMD_FUNC(cumode) /* If the target client is founder, no one else can change their mode but themselves. */ - if (chl->mode & SILC_CHANNEL_UMODE_CHANFO && chl->client != target_client) { + if (chl->mode & SILC_CHANNEL_UMODE_CHANFO && client != target_client) { silc_server_command_send_status_reply(cmd, SILC_COMMAND_CUMODE, - SILC_STATUS_ERR_NOT_YOU); + SILC_STATUS_ERR_NO_CHANNEL_PRIV); goto out; } @@ -4560,7 +4541,7 @@ SILC_SERVER_CMD_FUNC(kick) silc_server_send_notify_kicked(server, server->router->connection, server->server_type == SILC_ROUTER ? TRUE : FALSE, channel, - target_client->id, comment); + target_client->id, client->id, comment); if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY)) { /* Re-generate channel key */ @@ -4637,6 +4618,12 @@ SILC_SERVER_CMD_FUNC(oper) /* Client is now server operator */ client->mode |= SILC_UMODE_SERVER_OPERATOR; + /* Update statistics */ + if (client->connection) + server->stat.my_server_ops++; + if (server->server_type == SILC_ROUTER) + server->stat.server_ops++; + /* Send UMODE change to primary router */ if (!server->standalone) silc_server_send_notify_umode(server, server->router->connection, TRUE, @@ -4715,6 +4702,12 @@ SILC_SERVER_CMD_FUNC(silcoper) /* Client is now router operator */ client->mode |= SILC_UMODE_ROUTER_OPERATOR; + /* Update statistics */ + if (client->connection) + server->stat.my_router_ops++; + if (server->server_type == SILC_ROUTER) + server->stat.router_ops++; + /* Send UMODE change to primary router */ if (!server->standalone) silc_server_send_notify_umode(server, server->router->connection, TRUE, @@ -4837,7 +4830,11 @@ SILC_SERVER_CMD_FUNC(ban) } /* Get entry to the channel user list */ - silc_hash_table_find(channel->user_list, client, NULL, (void *)&chl); + if (!silc_hash_table_find(channel->user_list, client, NULL, (void *)&chl)) { + silc_server_command_send_status_reply(cmd, SILC_COMMAND_BAN, + SILC_STATUS_ERR_NOT_ON_CHANNEL); + goto out; + } /* The client must be at least channel operator. */ if (!(chl->mode & SILC_CHANNEL_UMODE_CHANOP)) { @@ -4898,7 +4895,7 @@ SILC_SERVER_CMD_FUNC(ban) 2, id, id_len, 3, channel->ban_list, channel->ban_list ? - strlen(channel->ban_list) - 1 : 0); + strlen(channel->ban_list) : 0); silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY, 0, packet->data, packet->len, FALSE); @@ -4974,7 +4971,7 @@ SILC_SERVER_CMD_FUNC(close) server->router = NULL; server->standalone = TRUE; } - silc_server_free_sock_user_data(server, sock); + silc_server_free_sock_user_data(server, sock, NULL); silc_server_close_connection(server, sock); out: @@ -5161,15 +5158,13 @@ SILC_SERVER_CMD_FUNC(users) /* Reprocess this packet after received reply */ silc_server_command_pending(server, SILC_COMMAND_USERS, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_users, silc_server_command_dup(cmd)); cmd->pending = TRUE; silc_command_set_ident(cmd->payload, ident); - silc_buffer_free(tmpbuf); silc_free(id); - return; + goto out; } /* Check the global list as well. */ @@ -5252,6 +5247,7 @@ SILC_SERVER_CMD_FUNC(getkey) uint32 tmp_len, pklen; SilcBuffer pk = NULL; SilcIdType id_type; + SilcPublicKey public_key; SILC_LOG_DEBUG(("Start")); @@ -5303,14 +5299,12 @@ SILC_SERVER_CMD_FUNC(getkey) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_GETKEY, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_getkey, silc_server_command_dup(cmd)); cmd->pending = TRUE; - silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); - return; + goto out; } if (!client) { @@ -5322,11 +5316,12 @@ SILC_SERVER_CMD_FUNC(getkey) /* The client is locally connected, just get the public key and send it back. If they key does not exist then do not send it, send just OK reply */ - if (!client->data.public_key) { + public_key = client->data.public_key; + if (!public_key) { pkdata = NULL; pklen = 0; } else { - tmp = silc_pkcs_public_key_encode(client->data.public_key, &tmp_len); + tmp = silc_pkcs_public_key_encode(public_key, &tmp_len); pk = silc_buffer_alloc(4 + tmp_len); silc_buffer_pull_tail(pk, SILC_BUFFER_END(pk)); silc_buffer_format(pk, @@ -5369,14 +5364,12 @@ SILC_SERVER_CMD_FUNC(getkey) /* Reprocess this packet after received reply from router */ silc_server_command_pending(server, SILC_COMMAND_GETKEY, silc_command_get_ident(cmd->payload), - silc_server_command_destructor, silc_server_command_getkey, silc_server_command_dup(cmd)); cmd->pending = TRUE; - silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); - return; + goto out; } if (!server_entry) { @@ -5386,12 +5379,14 @@ SILC_SERVER_CMD_FUNC(getkey) } /* If they key does not exist then do not send it, send just OK reply */ - if (!server_entry->data.public_key) { + public_key = (!server_entry->data.public_key ? + (server_entry == server->id_entry ? server->public_key : + NULL) : server_entry->data.public_key); + if (!public_key) { pkdata = NULL; pklen = 0; } else { - tmp = silc_pkcs_public_key_encode(server_entry->data.public_key, - &tmp_len); + tmp = silc_pkcs_public_key_encode(public_key, &tmp_len); pk = silc_buffer_alloc(4 + tmp_len); silc_buffer_pull_tail(pk, SILC_BUFFER_END(pk)); silc_buffer_format(pk,