X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Fsilcd%2Fserver_util.c;h=dead873a6d250037bff3b3c9a91a585e9a4acc0a;hp=89beb68a2db28d50ef471446d1ad6efb34ccda39;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=ad84e8073e747c282e234e14e21a78bad24960cb diff --git a/apps/silcd/server_util.c b/apps/silcd/server_util.c index 89beb68a..dead873a 100644 --- a/apps/silcd/server_util.c +++ b/apps/silcd/server_util.c @@ -42,7 +42,9 @@ silc_server_remove_clients_channels(SilcServer server, if (!client) return; - SILC_LOG_DEBUG(("Remove client from all channels")); + SILC_LOG_DEBUG(("Remove client %s from all channels", + client->nickname ? client->nickname : + (unsigned char *)"")); if (silc_hash_table_find(clients, client, NULL, NULL)) silc_hash_table_del(clients, client); @@ -55,7 +57,7 @@ silc_server_remove_clients_channels(SilcServer server, /* Remove channel if this is last client leaving the channel, unless the channel is permanent. */ - if (server->server_type == SILC_ROUTER && + if (server->server_type != SILC_SERVER && silc_hash_table_count(channel->user_list) < 2) { if (silc_hash_table_find(channels, channel, NULL, NULL)) silc_hash_table_del(channels, channel); @@ -87,7 +89,7 @@ silc_server_remove_clients_channels(SilcServer server, /* If there is not at least one local user on the channel then we don't need the channel entry anymore, we can remove it safely, unless the channel is permanent channel */ - if (server->server_type != SILC_ROUTER && + if (server->server_type == SILC_SERVER && !silc_server_channel_has_local(channel)) { if (silc_hash_table_find(channels, channel, NULL, NULL)) silc_hash_table_del(channels, channel); @@ -176,10 +178,11 @@ bool silc_server_remove_clients_by_server(SilcServer server, client = (SilcClientEntry)id_cache->context; /* If client is not registered, is not originated from `router' - or is not owned by `entry', skip it. */ + and is not owned by `entry', skip it. */ if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED) || client->router != router || - !SILC_ID_COMPARE(client->id, entry->id, client->id->ip.data_len)) { + (router != entry && !SILC_ID_COMPARE(client->id, entry->id, + client->id->ip.data_len))) { if (!silc_idcache_list_next(list, &id_cache)) break; else @@ -217,6 +220,7 @@ bool silc_server_remove_clients_by_server(SilcServer server, client->data.status &= ~SILC_IDLIST_STATUS_REGISTERED; id_cache->expire = SILC_ID_CACHE_EXPIRE_DEF; } else { + silc_idlist_del_data(client); silc_idlist_del_client(server->local_list, client); } @@ -234,10 +238,11 @@ bool silc_server_remove_clients_by_server(SilcServer server, client = (SilcClientEntry)id_cache->context; /* If client is not registered, is not originated from `router' - or is not owned by `entry', skip it. */ + and is not owned by `entry', skip it. */ if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED) || client->router != router || - !SILC_ID_COMPARE(client->id, entry->id, client->id->ip.data_len)) { + (router != entry && !SILC_ID_COMPARE(client->id, entry->id, + client->id->ip.data_len))) { if (!silc_idcache_list_next(list, &id_cache)) break; else @@ -275,6 +280,7 @@ bool silc_server_remove_clients_by_server(SilcServer server, client->data.status &= ~SILC_IDLIST_STATUS_REGISTERED; id_cache->expire = SILC_ID_CACHE_EXPIRE_DEF; } else { + silc_idlist_del_data(client); silc_idlist_del_client(server->global_list, client); } @@ -285,6 +291,21 @@ bool silc_server_remove_clients_by_server(SilcServer server, silc_idcache_list_free(list); } + /* Return now if we are shutting down */ + if (server->server_shutdown) { + silc_hash_table_free(channels); + + if (server_signoff) { + for (i = 0; i < argc; i++) + silc_free(argv[i]); + silc_free(argv); + silc_free(argv_lens); + silc_free(argv_types); + silc_hash_table_free(clients); + } + return TRUE; + } + /* Send the SERVER_SIGNOFF notify */ if (server_signoff) { SilcBuffer args, not; @@ -313,6 +334,10 @@ bool silc_server_remove_clients_by_server(SilcServer server, SILC_PACKET_NOTIFY, 0, FALSE, not->data, not->len, FALSE); + /* Send notify also to local backup routers */ + silc_server_backup_send(server, NULL, SILC_PACKET_NOTIFY, 0, + not->data, not->len, FALSE, TRUE); + silc_buffer_free(args); silc_buffer_free(not); for (i = 0; i < argc; i++) @@ -335,7 +360,7 @@ bool silc_server_remove_clients_by_server(SilcServer server, } /* Do not send the channel key if private channel key mode is set */ - if (channel->mode & SILC_CHANNEL_MODE_PRIVKEY) + if (channel->mode & SILC_CHANNEL_MODE_PRIVKEY || !channel->channel_key) continue; silc_server_send_channel_key(server, NULL, channel, @@ -351,6 +376,7 @@ bool silc_server_remove_clients_by_server(SilcServer server, static SilcServerEntry silc_server_update_clients_by_real_server(SilcServer server, SilcServerEntry from, + SilcServerEntry to, SilcClientEntry client, bool local, SilcIDCacheEntry client_cache) @@ -358,6 +384,7 @@ silc_server_update_clients_by_real_server(SilcServer server, SilcServerEntry server_entry; SilcIDCacheEntry id_cache = NULL; SilcIDCacheList list; + bool tolocal = (to == server->id_entry); if (!silc_idcache_get_all(server->local_list->servers, &list)) return NULL; @@ -366,6 +393,7 @@ silc_server_update_clients_by_real_server(SilcServer server, while (id_cache) { server_entry = (SilcServerEntry)id_cache->context; if (server_entry != from && + (tolocal || server_entry != server->id_entry) && SILC_ID_COMPARE(server_entry->id, client->id, client->id->ip.data_len)) { SILC_LOG_DEBUG(("Found (local) %s", @@ -412,7 +440,8 @@ silc_server_update_clients_by_real_server(SilcServer server, if (silc_idcache_list_first(list, &id_cache)) { while (id_cache) { server_entry = (SilcServerEntry)id_cache->context; - if (server_entry != from && + if (server_entry != from && server_entry != server->id_entry && + (tolocal || server_entry != server->id_entry) && SILC_ID_COMPARE(server_entry->id, client->id, client->id->ip.data_len)) { SILC_LOG_DEBUG(("Found (global) %s", @@ -425,8 +454,7 @@ silc_server_update_clients_by_real_server(SilcServer server, if (local) { SILC_LOG_DEBUG(("Moving client to global list")); silc_idcache_add(server->global_list->clients, client_cache->name, - client_cache->id, client_cache->context, - client_cache->expire, NULL); + client_cache->id, client_cache->context, 0, NULL); silc_idcache_del_by_context(server->local_list->clients, client); } server_entry = server_entry->router; @@ -436,8 +464,7 @@ silc_server_update_clients_by_real_server(SilcServer server, if (server_entry->server_type != SILC_BACKUP_ROUTER && local) { SILC_LOG_DEBUG(("Moving client to global list")); silc_idcache_add(server->global_list->clients, client_cache->name, - client_cache->id, client_cache->context, - client_cache->expire, NULL); + client_cache->id, client_cache->context, 0, NULL); silc_idcache_del_by_context(server->local_list->clients, client); } } @@ -461,30 +488,18 @@ silc_server_update_clients_by_real_server(SilcServer server, attempt to figure out which clients really are originated from the `from' and which are originated from a server that we have connection to, when we've acting as backup router. If it is FALSE the `to' will - be the new source. This function also removes the clients that are - *really* originated from `from' if `remove_from' is TRUE. These are - clients that the `from' owns, and not just clients that are behind - the `from'. If `from' is NULL then all non-local clients are switched - to `to'. */ + be the new source. */ void silc_server_update_clients_by_server(SilcServer server, SilcServerEntry from, SilcServerEntry to, - bool resolve_real_server, - bool remove_from) + bool resolve_real_server) { SilcIDCacheList list = NULL; SilcIDCacheEntry id_cache = NULL; SilcClientEntry client = NULL; bool local; - if (from) - SILC_LOG_DEBUG(("Updating %s", silc_id_render(from->id, - SILC_ID_SERVER))); - if (to) - SILC_LOG_DEBUG(("to %s", silc_id_render(to->id, - SILC_ID_SERVER))); - local = FALSE; if (silc_idcache_get_all(server->global_list->clients, &list)) { if (silc_idcache_list_first(list, &id_cache)) { @@ -501,28 +516,19 @@ void silc_server_update_clients_by_server(SilcServer server, continue; } - SILC_LOG_DEBUG(("Client (global) %s", + SILC_LOG_DEBUG(("Client %s", silc_id_render(client->id, SILC_ID_CLIENT))); if (client->router) - SILC_LOG_DEBUG(("Client->router (global) %s", + SILC_LOG_DEBUG(("Client->router %s", silc_id_render(client->router->id, SILC_ID_SERVER))); if (from) { if (client->router == from) { - /* Skip clients that are *really* owned by the `from' */ - if (remove_from && SILC_ID_COMPARE(from->id, client->id, - client->id->ip.data_len)) { - SILC_LOG_DEBUG(("Found really owned client, skip it")); - if (!silc_idcache_list_next(list, &id_cache)) - break; - else - continue; - } - if (resolve_real_server) { client->router = - silc_server_update_clients_by_real_server(server, from, client, - local, id_cache); + silc_server_update_clients_by_real_server(server, from, to, + client, local, + id_cache); if (!client->router) { if (server->server_type == SILC_ROUTER) client->router = from; @@ -540,7 +546,7 @@ void silc_server_update_clients_by_server(SilcServer server, if (client->router) SILC_LOG_DEBUG(("Client changed to %s", - silc_id_render(client->router->id, SILC_ID_CLIENT))); + silc_id_render(client->router->id, SILC_ID_SERVER))); if (!silc_idcache_list_next(list, &id_cache)) break; @@ -565,28 +571,19 @@ void silc_server_update_clients_by_server(SilcServer server, continue; } - SILC_LOG_DEBUG(("Client (local) %s", + SILC_LOG_DEBUG(("Client %s", silc_id_render(client->id, SILC_ID_CLIENT))); if (client->router) - SILC_LOG_DEBUG(("Client->router (local) %s", + SILC_LOG_DEBUG(("Client->router %s", silc_id_render(client->router->id, SILC_ID_SERVER))); if (from) { if (client->router == from) { - /* Skip clients that are *really* owned by the `from' */ - if (remove_from && SILC_ID_COMPARE(from->id, client->id, - client->id->ip.data_len)) { - SILC_LOG_DEBUG(("Found really owned client, skip it")); - if (!silc_idcache_list_next(list, &id_cache)) - break; - else - continue; - } - if (resolve_real_server) { client->router = - silc_server_update_clients_by_real_server(server, from, client, - local, id_cache); + silc_server_update_clients_by_real_server(server, from, to, + client, local, + id_cache); if (!client->router) client->router = from; } else { @@ -600,7 +597,7 @@ void silc_server_update_clients_by_server(SilcServer server, if (client->router) SILC_LOG_DEBUG(("Client changed to %s", - silc_id_render(client->router->id, SILC_ID_CLIENT))); + silc_id_render(client->router->id, SILC_ID_SERVER))); if (!silc_idcache_list_next(list, &id_cache)) break; @@ -608,12 +605,6 @@ void silc_server_update_clients_by_server(SilcServer server, } silc_idcache_list_free(list); } - - if (remove_from) - /* Now remove the clients that are still marked as orignated from the - `from'. These are the clients that really was owned by the `from' and - not just exist behind the `from'. */ - silc_server_remove_clients_by_server(server, from, from, TRUE); } /* Updates servers that are from `from' to be originated from `to'. This @@ -934,7 +925,7 @@ bool silc_server_channel_has_local(SilcChannelEntry channel) silc_hash_table_list(channel->user_list, &htl); while (silc_hash_table_get(&htl, NULL, (void **)&chl)) { - if (!chl->client->router) { + if (SILC_IS_LOCAL(chl->client)) { silc_hash_table_list_reset(&htl); return TRUE; } @@ -957,8 +948,6 @@ bool silc_server_channel_delete(SilcServer server, bool delchan = !(channel->mode & SILC_CHANNEL_MODE_FOUNDER_AUTH); if (delchan) { - SILC_LOG_DEBUG(("Deleting %s channel", channel->channel_name)); - /* Update statistics */ if (server->server_type == SILC_ROUTER) server->stat.chanclients -= channel->user_count; @@ -1070,7 +1059,8 @@ SilcUInt32 silc_server_num_sockets_by_ip(SilcServer server, const char *ip, int i, count; for (i = 0, count = 0; i < server->config->param.connections_max; i++) { - if (server->sockets[i] && !strcmp(server->sockets[i]->ip, ip) && + if (server->sockets[i] && !SILC_IS_LISTENER(server->sockets[i]) && + !strcmp(server->sockets[i]->ip, ip) && server->sockets[i]->type == type) count++; } @@ -1094,7 +1084,7 @@ SilcUInt32 silc_server_num_sockets_by_remote(SilcServer server, return 0; for (i = 0, count = 0; i < server->config->param.connections_max; i++) { - if (server->sockets[i] && + if (server->sockets[i] && !SILC_IS_LISTENER(server->sockets[i]) && ((ip && !strcmp(server->sockets[i]->ip, ip)) || (hostname && !strcmp(server->sockets[i]->hostname, hostname))) && server->sockets[i]->port == port && @@ -1468,8 +1458,8 @@ void silc_server_send_connect_notifys(SilcServer server, SILC_SERVER_SEND_NOTIFY(server, sock, SILC_NOTIFY_TYPE_NONE, ("Your connection is secured with %s cipher, " "key length %d bits", - idata->send_key->cipher->name, - idata->send_key->cipher->key_len)); + silc_cipher_get_name(idata->send_key), + silc_cipher_get_key_len(idata->send_key))); SILC_SERVER_SEND_NOTIFY(server, sock, SILC_NOTIFY_TYPE_NONE, ("Your current nickname is %s", client->nickname)); @@ -1525,7 +1515,7 @@ void silc_server_kill_client(SilcServer server, /* Remove the client from all channels. This generates new keys to the channels as well. */ silc_server_remove_from_channels(server, NULL, remote_client, FALSE, - NULL, TRUE); + NULL, TRUE, TRUE); /* Remove the client entry, If it is locally connected then we will also disconnect the client here */ @@ -1549,6 +1539,7 @@ void silc_server_kill_client(SilcServer server, } /* Remove remote client */ + silc_idlist_del_data(remote_client); if (!silc_idlist_del_client(server->global_list, remote_client)) { /* Remove this client from watcher list if it is */ silc_server_del_from_watcher_list(server, remote_client); @@ -1575,6 +1566,9 @@ silc_server_check_watcher_list_foreach(void *key, void *context, SilcClientEntry entry = context; SilcSocketConnection sock; + if (!context) + return; + if (entry == notify->client) return; @@ -1722,3 +1716,234 @@ silc_server_find_socket_by_host(SilcServer server, return NULL; } + +/* This function can be used to match the invite and ban lists. */ + +bool silc_server_inviteban_match(SilcServer server, SilcHashTable list, + SilcUInt8 type, void *check) +{ + unsigned char *tmp = NULL; + SilcUInt32 len = 0, t; + SilcHashTableList htl; + SilcBuffer entry, idp = NULL; + bool ret = FALSE; + + if (type < 1 || type > 3 || !check) + return FALSE; + + if (type == 1) { + tmp = strdup((char *)check); + if (!tmp) + return FALSE; + } + if (type == 2) { + tmp = silc_pkcs_public_key_encode(check, &len); + if (!tmp) + return FALSE; + } + if (type == 3) { + idp = silc_id_payload_encode(check, SILC_ID_CLIENT); + if (!idp) + return FALSE; + tmp = idp->data; + len = idp->len; + } + + /* Compare the list */ + silc_hash_table_list(list, &htl); + while (silc_hash_table_get(&htl, (void **)&t, (void **)&entry)) { + if (type == t) { + if (type == 1) { + if (silc_string_match((char *)entry, tmp)) { + ret = TRUE; + break; + } + } else if (!memcmp(entry->data, tmp, len)) { + ret = TRUE; + break; + } + } + } + silc_hash_table_list_reset(&htl); + + if (!idp) + silc_free(tmp); + silc_buffer_free(idp); + return ret; +} + +static void silc_server_inviteban_dummy_dest(void *key, void *context, + void *user_context) +{ + /* Nothing */ +} + +/* Process invite or ban information */ + +void silc_server_inviteban_process(SilcServer server, SilcHashTable list, + SilcUInt8 action, SilcArgumentPayload args) +{ + unsigned char *tmp; + SilcUInt32 type, len; + SilcBuffer tmp2; + SilcHashTableList htl; + + SILC_LOG_DEBUG(("Processing invite/ban for %s action", + action == 0x00 ? "ADD" : "DEL")); + + /* Add the information to invite list */ + if (action == 0x00) { + /* Traverse all arguments and add to the hash table according to + their type. */ + tmp = silc_argument_get_first_arg(args, &type, &len); + while (tmp) { + if (type == 1) { + /* Invite string. Get the old invite string from hash table + and append this at the end of the existing one. */ + char *string = NULL; + silc_hash_table_find(list, (void *)1, + NULL, (void **)&string); + silc_hash_table_del_ext(list, (void *)1, NULL, NULL, NULL, NULL, + silc_server_inviteban_dummy_dest, NULL); + if (!string) + string = silc_calloc(len + 2, sizeof(*string)); + else + string = silc_realloc(string, sizeof(*string) * + (strlen(string) + len + 2)); + memset(string + strlen(string), 0, len + 2); + if (tmp[len - 1] == ',') + tmp[len - 1] = '\0'; + strncat(string, tmp, len); + strncat(string, ",", 1); + + /* Add new invite string to invite list */ + silc_hash_table_add(list, (void *)1, string); + + } else if (type == 2) { + /* Public key. Check first if the public key is already on the + list and ignore it if it is, otherwise, add it to hash table. */ + + /* Check if the public key is in the list already */ + silc_hash_table_list(list, &htl); + while (silc_hash_table_get(&htl, (void **)&type, (void **)&tmp2)) { + if (type == 2 && !memcmp(tmp2->data, tmp, len)) { + tmp = NULL; + break; + } + } + silc_hash_table_list_reset(&htl); + + /* Add new public key to invite list */ + if (tmp) { + tmp2 = silc_buffer_alloc_size(len); + silc_buffer_put(tmp2, tmp, len); + silc_hash_table_add(list, (void *)2, tmp2); + } + + } else if (type == 3) { + /* Client ID */ + + /* Check if the ID is in the list already */ + silc_hash_table_list(list, &htl); + while (silc_hash_table_get(&htl, (void **)&type, (void **)&tmp2)) { + if (type == 3 && !memcmp(tmp2->data, tmp, len)) { + tmp = NULL; + break; + } + } + silc_hash_table_list_reset(&htl); + + /* Add new Client ID to invite list */ + if (tmp) { + tmp2 = silc_buffer_alloc_size(len); + silc_buffer_put(tmp2, tmp, len); + silc_hash_table_add(list, (void *)3, tmp2); + } + } + + tmp = silc_argument_get_next_arg(args, &type, &len); + } + } + + /* Delete information to invite list */ + if (action == 0x01 && list) { + /* Now delete the arguments from invite list */ + tmp = silc_argument_get_first_arg(args, &type, &len); + while (tmp) { + if (type == 1) { + /* Invite string. Get the old string from hash table and delete + the requested string. */ + char *string = NULL, *start, *end, *n; + + if (silc_hash_table_find(list, (void *)1, NULL, (void **)&string)) { + if (!strncmp(string, tmp, strlen(string) - 1)) { + silc_hash_table_del(list, (void *)1); + string = NULL; + } else { + start = strstr(string, tmp); + if (start && strlen(start) >= len) { + end = start + len; + n = silc_calloc(strlen(string) - len, sizeof(*n)); + strncat(n, string, start - string); + strncat(n, end + 1, ((string + strlen(string)) - end) - 1); + silc_hash_table_del(list, (void *)1); + string = n; + } + } + + /* Add new invite string to invite list */ + if (string) + silc_hash_table_add(list, (void *)1, string); + } + + } else if (type == 2) { + /* Public key. */ + + /* Delete from the invite list */ + silc_hash_table_list(list, &htl); + while (silc_hash_table_get(&htl, (void **)&type, (void **)&tmp2)) { + if (type == 2 && !memcmp(tmp2->data, tmp, len)) { + silc_hash_table_del_by_context(list, (void *)2, tmp2); + break; + } + } + silc_hash_table_list_reset(&htl); + + } else if (type == 3) { + /* Client ID */ + + /* Delete from the invite list */ + silc_hash_table_list(list, &htl); + while (silc_hash_table_get(&htl, (void **)&type, (void **)&tmp2)) { + if (type == 3 && !memcmp(tmp2->data, tmp, len)) { + silc_hash_table_del_by_context(list, (void *)3, tmp2); + break; + } + } + silc_hash_table_list_reset(&htl); + } + + tmp = silc_argument_get_next_arg(args, &type, &len); + } + } +} + +/* Destructor for invite or ban list entrys */ + +void silc_server_inviteban_destruct(void *key, void *context, + void *user_context) +{ + switch ((SilcUInt32)key) { + case 1: + /* Invite string */ + silc_free(context); + break; + case 2: + case 3: + /* Public key/Channel ID SilcBuffer */ + silc_buffer_free(context); + break; + default: + break; + } +}