Completed the backup router support for standalone routers.
[silc.git] / apps / silcd / server_util.c
index c041ffb0caa822e980c4f69fc326021b19b7b5b6..d0157e3a5736740679016c5d45476dcfdb3862bf 100644 (file)
@@ -38,18 +38,15 @@ silc_server_remove_clients_channels(SilcServer server,
   SilcChannelEntry channel;
   SilcChannelClientEntry chl, chl2;
   SilcHashTableList htl, htl2;
-  SilcBuffer clidp;
 
-  SILC_LOG_DEBUG(("Start"));
-
-  if (!client || !client->id)
+  if (!client)
     return;
 
+  SILC_LOG_DEBUG(("Remove client from all channels"));
+
   if (silc_hash_table_find(clients, client, NULL, NULL))
     silc_hash_table_del(clients, client);
 
-  clidp = silc_id_payload_encode(client->id, SILC_ID_CLIENT);
-
   /* Remove the client from all channels. The client is removed from
      the channels' user list. */
   silc_hash_table_list(client->channels, &htl);
@@ -80,7 +77,7 @@ silc_server_remove_clients_channels(SilcServer server,
     silc_free(chl);
 
     /* Update statistics */
-    if (client->connection)
+    if (SILC_IS_LOCAL(client))
       server->stat.my_chanclients--;
     if (server->server_type == SILC_ROUTER) {
       server->stat.cell_chanclients--;
@@ -120,16 +117,15 @@ silc_server_remove_clients_channels(SilcServer server,
       silc_hash_table_add(channels, channel, channel);
   }
   silc_hash_table_list_reset(&htl);
-  silc_buffer_free(clidp);
 }
 
-/* This function is used to remove all client entries by the server `entry'.
-   This is called when the connection is lost to the server. In this case
-   we must invalidate all the client entries owned by the server `entry'. 
-   If the `server_signoff' is TRUE then the SERVER_SIGNOFF notify is
+/* This function removes all client entries that are originated from
+   `router' and are owned by `entry'.  `router' and `entry' can be same
+   too.  If `server_signoff' is TRUE then SERVER_SIGNOFF notify is 
    distributed to our local clients. */
 
-bool silc_server_remove_clients_by_server(SilcServer server, 
+bool silc_server_remove_clients_by_server(SilcServer server,
+                                         SilcServerEntry router,
                                          SilcServerEntry entry,
                                          bool server_signoff)
 {
@@ -144,7 +140,14 @@ bool silc_server_remove_clients_by_server(SilcServer server,
   SilcHashTable channels, clients;
   int i;
 
-  SILC_LOG_DEBUG(("Start"));
+  if (!(entry->data.status & SILC_IDLIST_STATUS_REGISTERED))
+    return FALSE;
+
+  SILC_LOG_DEBUG(("Removing clients by %s",
+                 entry->server_name ? entry->server_name : "server"));
+
+  if (!router)
+    router = entry;
 
   /* Allocate the hash table that holds the channels that require
      channel key re-generation after we've removed this server's clients
@@ -168,18 +171,16 @@ bool silc_server_remove_clients_by_server(SilcServer server,
   }
 
   if (silc_idcache_get_all(server->local_list->clients, &list)) {
-
     if (silc_idcache_list_first(list, &id_cache)) {
       while (id_cache) {
        client = (SilcClientEntry)id_cache->context;
-       if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
-         if (!silc_idcache_list_next(list, &id_cache))
-           break;
-         else
-           continue;
-       }
 
-       if (client->router != entry) {
+       /* If client is not registered, is not originated from `router'
+          or 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,
+                                                client->id->ip.data_len))) {
          if (!silc_idcache_list_next(list, &id_cache))
            break;
          else
@@ -208,15 +209,15 @@ bool silc_server_remove_clients_by_server(SilcServer server,
        SILC_OPER_STATS_UPDATE(client, server, SILC_UMODE_SERVER_OPERATOR);
        SILC_OPER_STATS_UPDATE(client, router, SILC_UMODE_ROUTER_OPERATOR);
 
-       /* Remove the client entry */
        silc_server_remove_clients_channels(server, entry, clients,
                                            client, channels);
+       silc_server_del_from_watcher_list(server, client);
+
+       /* Remove the client entry */
        if (!server_signoff) {
          client->data.status &= ~SILC_IDLIST_STATUS_REGISTERED;
          id_cache->expire = SILC_ID_CACHE_EXPIRE_DEF;
        } else {
-         /* Remove this client from watcher list if it is */
-         silc_server_del_from_watcher_list(server, client);
          silc_idlist_del_client(server->local_list, client);
        }
 
@@ -232,14 +233,13 @@ bool silc_server_remove_clients_by_server(SilcServer server,
     if (silc_idcache_list_first(list, &id_cache)) {
       while (id_cache) {
        client = (SilcClientEntry)id_cache->context;
-       if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
-         if (!silc_idcache_list_next(list, &id_cache))
-           break;
-         else
-           continue;
-       }
-       
-       if (client->router != entry) {
+
+       /* If client is not registered, is not originated from `router'
+          or 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,
+                                                client->id->ip.data_len))) {
          if (!silc_idcache_list_next(list, &id_cache))
            break;
          else
@@ -268,9 +268,11 @@ bool silc_server_remove_clients_by_server(SilcServer server,
        SILC_OPER_STATS_UPDATE(client, server, SILC_UMODE_SERVER_OPERATOR);
        SILC_OPER_STATS_UPDATE(client, router, SILC_UMODE_ROUTER_OPERATOR);
 
-       /* Remove the client entry */
        silc_server_remove_clients_channels(server, entry, clients,
                                            client, channels);
+       silc_server_del_from_watcher_list(server, client);
+
+       /* Remove the client entry */
        if (!server_signoff) {
          client->data.status &= ~SILC_IDLIST_STATUS_REGISTERED;
          id_cache->expire = SILC_ID_CACHE_EXPIRE_DEF;
@@ -289,22 +291,20 @@ bool silc_server_remove_clients_by_server(SilcServer server,
   if (server_signoff) {
     SilcBuffer args, not;
 
+    SILC_LOG_DEBUG(("Sending SERVER_SIGNOFF for %s with %d clients",
+                   silc_id_render(entry->id, SILC_ID_SERVER), argc - 1));
+
     /* Send SERVER_SIGNOFF notify to our primary router */
-    if (!server->standalone && server->router &&
-       server->router != entry) {
+    if (server->router != entry) {
       args = silc_argument_payload_encode(1, argv, argv_lens,
                                          argv_types);
-      silc_server_send_notify_args(server, 
-                                  server->router->connection,
-                                  server->server_type == SILC_SERVER ? 
-                                  FALSE : TRUE, 
+      silc_server_send_notify_args(server, SILC_PRIMARY_ROUTE(server),
+                                  SILC_BROADCAST(server),
                                   SILC_NOTIFY_TYPE_SERVER_SIGNOFF,
                                   argc, args);
       silc_buffer_free(args);
     }
 
-    
-
     /* Send to local clients. We also send the list of client ID's that
        is to be removed for those servers that would like to use that list. */
     args = silc_argument_payload_encode(argc, argv, argv_lens,
@@ -463,70 +463,65 @@ 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'. */
+   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;
 
-  SILC_LOG_DEBUG(("Start"));
-
-  SILC_LOG_DEBUG(("Updating %s", silc_id_render(from->id,
-                                               SILC_ID_SERVER)));
-  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)) {
       while (id_cache) {
        client = (SilcClientEntry)id_cache->context;
-       if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
+
+       /* If entry is disabled skip it.  If entry is local to us, do not
+          switch it to anyone else, it is ours so skip it. */
+       if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED) ||
+           SILC_IS_LOCAL(client)) {
          if (!silc_idcache_list_next(list, &id_cache))
            break;
          else
            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 (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);
-           if (!client->router)
+       if (from) {
+         if (client->router == from) {
+           if (resolve_real_server) {
+             client->router = 
+               silc_server_update_clients_by_real_server(server, from, client,
+                                                         local, id_cache);
+             if (!client->router) {
+               if (server->server_type == SILC_ROUTER)
+                 client->router = from;
+               else
+                 client->router = to;
+             }
+           } else {
              client->router = to;
-         } else {
-           client->router = to;
+           }
          }
+       } else {
+         /* All are changed */
+         client->router = to;
        }
 
+       if (client->router)
+         SILC_LOG_DEBUG(("Client changed to %s", 
+                         silc_id_render(client->router->id, SILC_ID_CLIENT)));
+
        if (!silc_idcache_list_next(list, &id_cache))
          break;
       }
@@ -539,53 +534,50 @@ void silc_server_update_clients_by_server(SilcServer server,
     if (silc_idcache_list_first(list, &id_cache)) {
       while (id_cache) {
        client = (SilcClientEntry)id_cache->context;
-       if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
+
+       /* If entry is disabled skip it.  If entry is local to us, do not
+          switch it to anyone else, it is ours so skip it. */
+       if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED) ||
+           SILC_IS_LOCAL(client)) {
          if (!silc_idcache_list_next(list, &id_cache))
            break;
          else
            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 (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);
-           if (!client->router)
-             client->router = from; /* on local list put old from */
-         } else {
-           client->router = to;
+       if (from) {
+         if (client->router == from) {
+           if (resolve_real_server) {
+             client->router = 
+               silc_server_update_clients_by_real_server(server, from, client,
+                                                         local, id_cache);
+             if (!client->router)
+               client->router = from;
+           } else {
+             client->router = to;
+           }
          }
+       } else {
+         /* All are changed */
+         client->router = to;
        }
 
+       if (client->router)
+         SILC_LOG_DEBUG(("Client changed to %s", 
+                         silc_id_render(client->router->id, SILC_ID_CLIENT)));
+
        if (!silc_idcache_list_next(list, &id_cache))
          break;
       }
     }
     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, TRUE);
 }
 
 /* Updates servers that are from `from' to be originated from `to'.  This
@@ -599,16 +591,197 @@ void silc_server_update_servers_by_server(SilcServer server,
   SilcIDCacheEntry id_cache = NULL;
   SilcServerEntry server_entry = NULL;
 
-  SILC_LOG_DEBUG(("Start"));
+  SILC_LOG_DEBUG(("Updating servers"));
+
+  if (silc_idcache_get_all(server->local_list->servers, &list)) {
+    if (silc_idcache_list_first(list, &id_cache)) {
+      while (id_cache) {
+       server_entry = (SilcServerEntry)id_cache->context;
+
+       /* If entry is local to us, do not switch it to any anyone else,
+          it is ours. */
+       if (SILC_IS_LOCAL(server_entry) || server_entry == server->id_entry ||
+           server_entry == from) {
+         if (!silc_idcache_list_next(list, &id_cache))
+           break;
+         else
+           continue;
+       }
+
+       /* If we are standalone router, any server that is not directly
+          connected to cannot exist anymore.  If we are not standalone
+          we update it correctly. */
+       if (server->server_type == SILC_ROUTER && server->standalone) {
+         silc_server_backup_del(server, server_entry);
+         silc_server_backup_replaced_del(server, server_entry);
+         silc_idlist_del_data(server_entry);
+         silc_idlist_del_server(server->local_list, server_entry);
+         server->stat.servers--;
+         server->stat.cell_servers--;
+       } else {
+         /* XXX if we are not standalone, do a check from local config
+            whether this server is in our cell, but not connected to
+            us (in which case we must remove it). */
+
+         if (server_entry->router == from) {
+           SILC_LOG_DEBUG(("Updating server (local) %s",
+                           server_entry->server_name ? 
+                           server_entry->server_name : ""));
+           server_entry->router = to;
+           server_entry->connection = to->connection;
+         }
+       }
+
+       if (!silc_idcache_list_next(list, &id_cache))
+         break;
+      }
+    }
+    silc_idcache_list_free(list);
+  }
+
+  if (silc_idcache_get_all(server->global_list->servers, &list)) {
+    if (silc_idcache_list_first(list, &id_cache)) {
+      while (id_cache) {
+       server_entry = (SilcServerEntry)id_cache->context;
+
+       /* If entry is local to us, do not switch it to anyone else,
+          it is ours. */
+       if (SILC_IS_LOCAL(server_entry) || server_entry == server->id_entry ||
+           server_entry == from) {
+         if (!silc_idcache_list_next(list, &id_cache))
+           break;
+         else
+           continue;
+       }
+
+       /* If we are standalone router, any server that is not directly
+          connected to cannot exist anymore.  If we are not standalone
+          we update it correctly. */
+       if (server->server_type == SILC_ROUTER && server->standalone) {
+         silc_server_backup_del(server, server_entry);
+         silc_server_backup_replaced_del(server, server_entry);
+         silc_idlist_del_data(server_entry);
+         silc_idlist_del_server(server->global_list, server_entry);
+         server->stat.servers--;
+         server->stat.cell_servers--;
+       } else {
+         /* XXX if we are not standalone, do a check from local config
+            whether this server is in our cell, but not connected to
+            us (in which case we must remove it). */
+
+         if (server_entry->router == from) {
+           SILC_LOG_DEBUG(("Updating server (global) %s",
+                           server_entry->server_name ? 
+                           server_entry->server_name : ""));
+           server_entry->router = to;
+           server_entry->connection = to->connection;
+         }
+       }
+
+       if (!silc_idcache_list_next(list, &id_cache))
+         break;
+      }
+    }
+    silc_idcache_list_free(list);
+  }
+}
+
+
+/* Toggles the enabled/disabled status of local server connections.  Packets
+   can be sent to the servers when `toggle_enabled' is TRUE and will be
+   dropped if `toggle_enabled' is FALSE, after this function is called. */
+
+void silc_server_local_servers_toggle_enabled(SilcServer server,
+                                             bool toggle_enabled)
+{
+  SilcIDCacheList list = NULL;
+  SilcIDCacheEntry id_cache = NULL;
+  SilcServerEntry server_entry = NULL;
+
+  if (silc_idcache_get_all(server->local_list->servers, &list)) {
+    if (silc_idcache_list_first(list, &id_cache)) {
+      while (id_cache) {
+       server_entry = (SilcServerEntry)id_cache->context;
+       if (!SILC_IS_LOCAL(server_entry) || server_entry == server->id_entry) {
+         if (!silc_idcache_list_next(list, &id_cache))
+           break;
+         else
+           continue;
+       }
+
+       if (toggle_enabled)
+         server_entry->data.status &= ~SILC_IDLIST_STATUS_DISABLED;
+       else
+         server_entry->data.status |= SILC_IDLIST_STATUS_DISABLED;
+
+       if (!silc_idcache_list_next(list, &id_cache))
+         break;
+      }
+    }
+    silc_idcache_list_free(list);
+  }
+
+  if (silc_idcache_get_all(server->global_list->servers, &list)) {
+    if (silc_idcache_list_first(list, &id_cache)) {
+      while (id_cache) {
+       server_entry = (SilcServerEntry)id_cache->context;
+       if (!SILC_IS_LOCAL(server_entry) || server_entry == server->id_entry) {
+         if (!silc_idcache_list_next(list, &id_cache))
+           break;
+         else
+           continue;
+       }
+
+       if (toggle_enabled)
+         server_entry->data.status &= ~SILC_IDLIST_STATUS_DISABLED;
+       else
+         server_entry->data.status |= SILC_IDLIST_STATUS_DISABLED;
+
+       if (!silc_idcache_list_next(list, &id_cache))
+         break;
+      }
+    }
+    silc_idcache_list_free(list);
+  }
+}
+
+/* Removes servers that are originated from the `from'.  The server
+   entry is deleted in this function.  If `remove_clients' is TRUE then
+   all clients originated from the server are removed too, and server
+   signoff is sent.  Note that this does not remove the `from'.  This
+   also does not remove locally connected servers. */
+
+void silc_server_remove_servers_by_server(SilcServer server,
+                                         SilcServerEntry from,
+                                         bool remove_clients)
+{
+  SilcIDCacheList list = NULL;
+  SilcIDCacheEntry id_cache = NULL;
+  SilcServerEntry server_entry = NULL;
+
+  SILC_LOG_DEBUG(("Removing servers by %s",
+                 from->server_name ? from->server_name : "server"));
 
   if (silc_idcache_get_all(server->local_list->servers, &list)) {
     if (silc_idcache_list_first(list, &id_cache)) {
       while (id_cache) {
        server_entry = (SilcServerEntry)id_cache->context;
-       if (server_entry->router == from) {
-         server_entry->router = to;
-         server_entry->connection = to->connection;
+       if (SILC_IS_LOCAL(server_entry) || server_entry == server->id_entry ||
+         server_entry->router != from || server_entry == from) {
+         if (!silc_idcache_list_next(list, &id_cache))
+           break;
+         else
+           continue;
        }
+
+       /* Remove clients owned by this server */
+       if (remove_clients)
+         silc_server_remove_clients_by_server(server, from, server_entry,
+                                              TRUE);
+
+       /* Remove the server */
+       silc_idlist_del_server(server->local_list, server_entry);
+
        if (!silc_idcache_list_next(list, &id_cache))
          break;
       }
@@ -620,10 +793,22 @@ void silc_server_update_servers_by_server(SilcServer server,
     if (silc_idcache_list_first(list, &id_cache)) {
       while (id_cache) {
        server_entry = (SilcServerEntry)id_cache->context;
-       if (server_entry->router == from) {
-         server_entry->router = to;
-         server_entry->connection = to->connection;
+       if (SILC_IS_LOCAL(server_entry) || server_entry == server->id_entry ||
+         server_entry->router != from || server_entry == from) {
+         if (!silc_idcache_list_next(list, &id_cache))
+           break;
+         else
+           continue;
        }
+
+       /* Remove clients owned by this server */
+       if (remove_clients)
+         silc_server_remove_clients_by_server(server, from, server_entry,
+                                              TRUE);
+
+       /* Remove the server */
+       silc_idlist_del_server(server->global_list, server_entry);
+
        if (!silc_idcache_list_next(list, &id_cache))
          break;
       }
@@ -736,8 +921,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;
@@ -769,7 +952,7 @@ bool silc_server_channel_delete(SilcServer server,
     channel->user_count--;
 
     /* Update statistics */
-    if (chl->client->connection)
+    if (SILC_IS_LOCAL(chl->client))
       server->stat.my_chanclients--;
     if (server->server_type == SILC_ROUTER) {
       server->stat.cell_chanclients--;
@@ -955,6 +1138,8 @@ bool silc_server_connection_allowed(SilcServer server,
   SilcUInt32 r_software_version, l_software_version;
   char *r_vendor_version = NULL, *l_vendor_version;
 
+  SILC_LOG_DEBUG(("Checking whether connection is allowed"));
+
   /* Check version */
 
   l_protocol_version = 
@@ -1075,8 +1260,10 @@ bool silc_server_check_cmode_rights(SilcServer server,
   }
   
   if (mode & SILC_CHANNEL_MODE_PASSPHRASE) {
-    if (is_op && !is_fo)
-      return FALSE;
+    if (!(channel->mode & SILC_CHANNEL_MODE_PASSPHRASE)) {
+      if (is_op && !is_fo)
+       return FALSE;
+    }
   } else {
     if (channel->mode & SILC_CHANNEL_MODE_PASSPHRASE) {
       if (is_op && !is_fo)
@@ -1085,8 +1272,10 @@ bool silc_server_check_cmode_rights(SilcServer server,
   }
 
   if (mode & SILC_CHANNEL_MODE_CIPHER) {
-    if (is_op && !is_fo)
-      return FALSE;
+    if (!(channel->mode & SILC_CHANNEL_MODE_CIPHER)) {
+      if (is_op && !is_fo)
+       return FALSE;
+    }
   } else {
     if (channel->mode & SILC_CHANNEL_MODE_CIPHER) {
       if (is_op && !is_fo)
@@ -1095,8 +1284,10 @@ bool silc_server_check_cmode_rights(SilcServer server,
   }
   
   if (mode & SILC_CHANNEL_MODE_FOUNDER_AUTH) {
-    if (is_op && !is_fo)
-      return FALSE;
+    if (!(channel->mode & SILC_CHANNEL_MODE_FOUNDER_AUTH)) {
+      if (is_op && !is_fo)
+       return FALSE;
+    }
   } else {
     if (channel->mode & SILC_CHANNEL_MODE_FOUNDER_AUTH) {
       if (is_op && !is_fo)
@@ -1105,8 +1296,10 @@ bool silc_server_check_cmode_rights(SilcServer server,
   }
   
   if (mode & SILC_CHANNEL_MODE_SILENCE_USERS) {
-    if (is_op && !is_fo)
-      return FALSE;
+    if (!(channel->mode & SILC_CHANNEL_MODE_SILENCE_USERS)) {
+      if (is_op && !is_fo)
+       return FALSE;
+    }
   } else {
     if (channel->mode & SILC_CHANNEL_MODE_SILENCE_USERS) {
       if (is_op && !is_fo)
@@ -1115,8 +1308,10 @@ bool silc_server_check_cmode_rights(SilcServer server,
   }
   
   if (mode & SILC_CHANNEL_MODE_SILENCE_OPERS) {
-    if (is_op && !is_fo)
-      return FALSE;
+    if (!(channel->mode & SILC_CHANNEL_MODE_SILENCE_OPERS)) {
+      if (is_op && !is_fo)
+       return FALSE;
+    }
   } else {
     if (channel->mode & SILC_CHANNEL_MODE_SILENCE_OPERS) {
       if (is_op && !is_fo)
@@ -1173,6 +1368,8 @@ void silc_server_send_connect_notifys(SilcServer server,
 {
   SilcIDListData idata = (SilcIDListData)client;
 
+  SILC_LOG_DEBUG(("Send welcome notifys"));
+
   /* Send some nice info to the client */
   SILC_SERVER_SEND_NOTIFY(server, sock, SILC_NOTIFY_TYPE_NONE,
                          ("Welcome to the SILC Network %s",
@@ -1275,10 +1472,9 @@ void silc_server_kill_client(SilcServer server,
                                      killer->data, killer->len);
 
   /* Send KILLED notify to primary route */
-  if (!server->standalone)
-    silc_server_send_notify_killed(server, server->router->connection, TRUE,
-                                  remote_client->id, comment, 
-                                  killer_id, killer_id_type);
+  silc_server_send_notify_killed(server, SILC_PRIMARY_ROUTE(server),
+                                SILC_BROADCAST(server), remote_client->id,
+                                comment, killer_id, killer_id_type);
 
   /* Send KILLED notify to the client directly */
   if (remote_client->connection || remote_client->router)
@@ -1303,12 +1499,17 @@ void silc_server_kill_client(SilcServer server,
   } else {
     /* Update statistics */
     server->stat.clients--;
-    server->stat.my_clients--;
     if (server->stat.cell_clients)
       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);
 
+    if (SILC_IS_LOCAL(remote_client)) {
+      server->stat.my_clients--;
+      silc_schedule_task_del_by_context(server->schedule, remote_client);
+      silc_idlist_del_data(remote_client);
+    }
+
     /* Remove remote client */
     if (!silc_idlist_del_client(server->global_list, remote_client)) {
       /* Remove this client from watcher list if it is */
@@ -1366,7 +1567,8 @@ bool silc_server_check_watcher_list(SilcServer server,
   unsigned char hash[16];
   WatcherNotifyContext n;
 
-  SILC_LOG_DEBUG(("Start"));
+  SILC_LOG_DEBUG(("Checking watcher list %s",
+                 client->nickname ? client->nickname : (unsigned char *)""));
 
   /* If the watching is rejected by the client do nothing */
   if (client->mode & SILC_UMODE_REJECT_WATCHING)
@@ -1411,8 +1613,9 @@ bool silc_server_del_from_watcher_list(SilcServer server,
     if (entry == client) {
       silc_hash_table_del_by_context(server->watcher_list, key, client);
 
-      SILC_LOG_DEBUG(("Removing %s from WATCH list",
-                     silc_id_render(client->id, SILC_ID_CLIENT)));
+      if (client->id)
+       SILC_LOG_DEBUG(("Removing %s from WATCH list",
+                       silc_id_render(client->id, SILC_ID_CLIENT)));
 
       /* Now check whether there still exists entries with this key, if not
         then free the key to not leak memory. */
@@ -1439,7 +1642,7 @@ bool silc_server_force_cumode_change(SilcServer server,
   SilcBuffer idp1, idp2;
   unsigned char cumode[4];
 
-  SILC_LOG_DEBUG(("Start"));
+  SILC_LOG_DEBUG(("Enforcing sender to change mode"));
 
   if (sock)
     silc_server_send_notify_cumode(server, sock, FALSE, channel, forced_mode,
@@ -1459,3 +1662,25 @@ bool silc_server_force_cumode_change(SilcServer server,
 
   return TRUE;
 }
+
+/* Find active socket connection by the IP address and port indicated by
+   `ip' and `port', and socket connection type of `type'. */
+
+SilcSocketConnection
+silc_server_find_socket_by_host(SilcServer server,
+                               SilcSocketType type,
+                               const char *ip, SilcUInt16 port)
+{
+  int i;
+
+  for (i = 0; i < server->config->param.connections_max; i++) {
+    if (!server->sockets[i])
+      continue;
+    if (!strcmp(server->sockets[i]->ip, ip) &&
+       (!port || server->sockets[i]->port == port) &&
+       server->sockets[i]->type == type)
+      return server->sockets[i];
+  }
+
+  return NULL;
+}