Use SILC_IS_LOCAL to check local entry.

[silc.git] / apps / silcd / server_util.c

diff --git a/apps/silcd/server_util.c b/apps/silcd/server_util.c
index fd6671b85d4b132fcb0be82296df670b0f3df30f..5511a3cae86847af31382aeaafd6fb11f07f94c0 100644 (file)
--- a/apps/silcd/server_util.c
+++ b/apps/silcd/server_util.c
@@ -176,7 +176,7 @@ 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 ||
            (router != entry && !SILC_ID_COMPARE(client->id, entry->id,
@@ -236,7 +236,7 @@ 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 ||
            (router != entry && !SILC_ID_COMPARE(client->id, entry->id,
@@ -332,6 +332,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++)
@@ -354,7 +358,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, 
@@ -370,6 +374,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)
@@ -377,6 +382,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;
@@ -385,6 +391,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",
@@ -431,7 +438,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",
@@ -444,8 +452,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;
@@ -455,8 +462,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);
          }
        }
@@ -518,8 +524,9 @@ void silc_server_update_clients_by_server(SilcServer server,
          if (client->router == from) {
            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;
@@ -537,7 +544,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;
@@ -572,8 +579,9 @@ void silc_server_update_clients_by_server(SilcServer server,
          if (client->router == from) {
            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 {
@@ -587,7 +595,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;
@@ -915,7 +923,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;
     }
@@ -1448,8 +1456,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));
@@ -1556,6 +1564,9 @@ silc_server_check_watcher_list_foreach(void *key, void *context,
   SilcClientEntry entry = context;
   SilcSocketConnection sock;
 
+  if (!context)
+    return;
+
   if (entry == notify->client)
     return;