updates.

diff --git a/CHANGES b/CHANGES
index 305ac07b9affb58f89961a35cf38c5e97c07ef4d..244132dee7c120b1210dab45da1d7393cfeb8317 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Mon Apr  9 16:54:44 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
+Mon Apr  9 17:54:44 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Added silc_pkcs_decode_identifier to decode the public key's
          identifier.  Affected file lib/silccrypt/silpkcs.[ch].
@@ -11,6 +11,12 @@ Mon Apr  9 16:54:44 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
        * Changed the PKCS api to return the public key length when
          setting the public key.
 
+       * Send heartbeat packet immediately, not through packet queue.
+         Affected file silcd/packet_send.c.
+
+       * Fixed a fatal bug in the public and private key file loading.
+         Affected file lib/silccrypt/silcpkcs.c.
+
 Sun Apr  8 19:30:56 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Made the key generation options to the silcd program.  Added

diff --git a/apps/silcd/packet_send.c b/apps/silcd/packet_send.c
index a88eedbeac363bf0ce46ab0694529d98d77cb539..2f7ecb7145aaea9fb477191184cbfbde827ff166 100644 (file)
--- a/apps/silcd/packet_send.c
+++ b/apps/silcd/packet_send.c
@@ -1499,7 +1499,7 @@ void silc_server_send_heartbeat(SilcServer server,
                                SilcSocketConnection sock)
 {
   silc_server_packet_send(server, sock, SILC_PACKET_HEARTBEAT, 0,
-                         NULL, 0, FALSE);
+                         NULL, 0, TRUE);
 }
 
 /* Generic function to relay packet we've received. This is used to relay

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 7b1d27f7cf31663bd18c5d3a25ac291cb223eb84..1b9c26c5439b4f9f8b1ab84b6826a1421581e606 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -2788,7 +2788,7 @@ SILC_TASK_CALLBACK(silc_server_channel_key_rekey)
 
   silc_task_register(server->timeout_queue, 0, 
                     silc_server_channel_key_rekey,
-                    (void *)rekey, 3600, 0,
+                    (void *)rekey, 3600 + 5, 0,
                     SILC_TASK_TIMEOUT,
                     SILC_TASK_PRI_NORMAL);
 }
@@ -2859,7 +2859,7 @@ void silc_server_create_channel_key(SilcServer server,
                                     silc_server_channel_key_rekey);
     silc_task_register(server->timeout_queue, 0, 
                       silc_server_channel_key_rekey,
-                      (void *)channel->rekey, 3600, 0,
+                      (void *)channel->rekey, 3600 + 5, 0,
                       SILC_TASK_TIMEOUT,
                       SILC_TASK_PRI_NORMAL);
   }
@@ -2964,7 +2964,7 @@ SilcChannelEntry silc_server_save_channel_key(SilcServer server,
                                     silc_server_channel_key_rekey);
     silc_task_register(server->timeout_queue, 0, 
                       silc_server_channel_key_rekey,
-                      (void *)channel->rekey, 3600, 0,
+                      (void *)channel->rekey, 3600 + 5, 0,
                       SILC_TASK_TIMEOUT,
                       SILC_TASK_PRI_NORMAL);
   }