updates

diff --git a/CHANGES b/CHANGES
index 5f6e0ba2510404c3d5da2663999af3a2812a9601..042ea05ce170c15bfc79689a6b8f440b00baf8da 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Tue Aug 14 07:29:27 CEST 2001  Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed a channel key regeneration bug.  It registered new
+         timeout tasks exponentially until all system resources were
+         used.  Affected file silcd/server.c.
+
 Sun Aug 12 20:48:14 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * Added the SILC Document generator to the scripts/silcdoc.

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 57e3839c95f5c278fcae561becc2a86559163968..66f5a996936b0c0c878e1c8f80089bdb6c826730 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -3052,12 +3052,6 @@ SILC_TASK_CALLBACK(silc_server_channel_key_rekey)
   if (!silc_server_create_channel_key(server, rekey->channel, rekey->key_len))
     return;
   silc_server_send_channel_key(server, NULL, rekey->channel, FALSE);
-
-  silc_schedule_task_add(server->schedule, 0, 
-                    silc_server_channel_key_rekey,
-                    (void *)rekey, 3600, 0,
-                    SILC_TASK_TIMEOUT,
-                    SILC_TASK_PRI_NORMAL);
 }
 
 /* Generates new channel key. This is used to create the initial channel key
@@ -3122,11 +3116,6 @@ bool silc_server_create_channel_key(SilcServer server,
     channel->rekey->channel = channel;
     channel->rekey->key_len = key_len;
 
-#if 0
-    /* XXX Now this cannot be a good thing */
-    silc_schedule_task_del_by_callback(server->schedule,
-                                    silc_server_channel_key_rekey);
-#endif
     silc_schedule_task_add(server->schedule, 0, 
                       silc_server_channel_key_rekey,
                       (void *)channel->rekey, 3600, 0,