updates.

diff --git a/CHANGES b/CHANGES
index c297d62474f9d63a976e8879feeeee53194d6b8d..e666e254ef8a7b121ed8958064396bf433e6a0df 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,9 +11,6 @@ Mon Apr  9 21: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.
 

diff --git a/apps/silc/client_ops.c b/apps/silc/client_ops.c
index 66e88bda2498da934e003d0170e550f237b769c4..3e01051c32fbafb461bbc35c01bf0ee417bb1e3e 100644 (file)
--- a/apps/silc/client_ops.c
+++ b/apps/silc/client_ops.c
@@ -1033,7 +1033,7 @@ int silc_verify_public_key(SilcClient client,
   snprintf(filename, sizeof(filename) - 1, "%s/.silc/%skeys/%s", 
           pw->pw_dir, entity, file);
 
-  /* Check wheter this key already exists */
+  /* Check whether this key already exists */
   if (stat(filename, &st) < 0) {
 
     fingerprint = silc_hash_fingerprint(NULL, pk, pk_len);

diff --git a/apps/silcd/packet_send.c b/apps/silcd/packet_send.c
index 2f7ecb7145aaea9fb477191184cbfbde827ff166..a88eedbeac363bf0ce46ab0694529d98d77cb539 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, TRUE);
+                         NULL, 0, FALSE);
 }
 
 /* Generic function to relay packet we've received. This is used to relay

diff --git a/apps/silcd/protocol.c b/apps/silcd/protocol.c
index 53521be26aabfe61f3f53360256c88a7d9df22b2..abb40e715f55cb9b80213a772a2e0e457faf90fc 100644 (file)
--- a/apps/silcd/protocol.c
+++ b/apps/silcd/protocol.c
@@ -1184,7 +1184,7 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
 
          /* Send the REKEY_DONE to indicate we will take new keys into use */
          silc_server_packet_send(server, ctx->sock, SILC_PACKET_REKEY_DONE,
-                                 0, NULL, 0, TRUE);
+                                 0, NULL, 0, FALSE);
 
          /* The protocol ends in next stage. */
          protocol->state = SILC_PROTOCOL_STATE_END;
@@ -1296,7 +1296,7 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
     /* Send the REKEY_DONE to indicate we will take new keys into use 
        now. */ 
     silc_server_packet_send(server, ctx->sock, SILC_PACKET_REKEY_DONE,
-                           0, NULL, 0, TRUE);
+                           0, NULL, 0, FALSE);
     
     /* The protocol ends in next stage. */
     protocol->state = SILC_PROTOCOL_STATE_END;
@@ -1318,7 +1318,7 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
        /* Send the REKEY_DONE to indicate we will take new keys into use 
           now. */ 
        silc_server_packet_send(server, ctx->sock, SILC_PACKET_REKEY_DONE,
-                               0, NULL, 0, TRUE);
+                               0, NULL, 0, FALSE);
       }
     }
 

diff --git a/lib/silcclient/protocol.c b/lib/silcclient/protocol.c
index a21ea9c45975a53b436e88bbe7174bfe854521fa..02939acba4c5c5dcef823c23a40ae6b2b8f1b395 100644 (file)
--- a/lib/silcclient/protocol.c
+++ b/lib/silcclient/protocol.c
@@ -817,7 +817,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
          /* Send the REKEY_DONE to indicate we will take new keys into use */
          silc_client_packet_send(client, ctx->sock, 
                                  SILC_PACKET_REKEY_DONE, 
-                                 NULL, 0, NULL, NULL, NULL, 0, TRUE);
+                                 NULL, 0, NULL, NULL, NULL, 0, FALSE);
 
          /* The protocol ends in next stage. */
          protocol->state = SILC_PROTOCOL_STATE_END;
@@ -929,7 +929,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
     /* Send the REKEY_DONE to indicate we will take new keys into use 
        now. */ 
     silc_client_packet_send(client, ctx->sock, SILC_PACKET_REKEY_DONE, 
-                           NULL, 0, NULL, NULL, NULL, 0, TRUE);
+                           NULL, 0, NULL, NULL, NULL, 0, FALSE);
     
     /* The protocol ends in next stage. */
     protocol->state = SILC_PROTOCOL_STATE_END;
@@ -952,7 +952,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
           now. */ 
        silc_client_packet_send(client, ctx->sock, 
                                SILC_PACKET_REKEY_DONE, 
-                               NULL, 0, NULL, NULL, NULL, 0, TRUE);
+                               NULL, 0, NULL, NULL, NULL, 0, FALSE);
       }
     }