From 0c577bc297a4f06cd2f0c4fef453855a586e4e2b Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Mon, 9 Apr 2001 15:35:17 +0000 Subject: [PATCH] updates. --- CHANGES | 8 +++++++- apps/silcd/packet_send.c | 2 +- apps/silcd/server.c | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 305ac07b..244132de 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -Mon Apr 9 16:54:44 EEST 2001 Pekka Riikonen +Mon Apr 9 17:54:44 EEST 2001 Pekka Riikonen * 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 * 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 * 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 a88eedbe..2f7ecb71 100644 --- 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 7b1d27f7..1b9c26c5 100644 --- 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); } -- 2.24.0