update

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 6962409d84774e37b7a4e484e2105fe4ba5386c6..148e51b1aa503728592346908af7f3f7ea9f91c3 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -1303,7 +1303,8 @@ SILC_TASK_CALLBACK(silc_server_packet_process)
     if (sock->outbuf->data - sock->outbuf->head)
      silc_buffer_push(sock->outbuf, sock->outbuf->data - sock->outbuf->head);
 
-    ret = silc_server_packet_send_real(server, sock, TRUE);
+    /* Send the packet */
+    ret = silc_packet_send(sock, TRUE);
 
     /* If returned -2 could not write to connection now, will do
        it later. */

diff --git a/doc/example_silc.conf b/doc/example_silc.conf
index 71fce70c059c100f98aedd2d494399f1e6ff4d05..f3b56e9f92bebcab7b3ed3221d208afffbc9e9ce 100644 (file)
--- a/doc/example_silc.conf
+++ b/doc/example_silc.conf
@@ -6,7 +6,7 @@
 # If the cipher is builtin the <module path> maybe omitted.
 #
 [cipher]
-aes-256-cbc:/usr/local/silc/silc/modules/aes.sim.so:32:16
+aes-256-cbc:/usr/local/silc/modules/aes.sim.so:32:16
 aes-192-cbc:/usr/local/silc/modules/aes.sim.so:24:16
 aes-128-cbc:/usr/local/silc/modules/aes.sim.so:16:16
 twofish-256-cbc:/usr/local/silc/modules/twofish.sim.so:32:16

diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c
index 12900bd103a4c9fb412d0a0fb59fe1595794886b..1b3cab0fa473f09d8b45fc1b9c75848483b84ce9 100644 (file)
--- a/lib/silcclient/client.c
+++ b/lib/silcclient/client.c
@@ -581,13 +581,14 @@ SILC_TASK_CALLBACK(silc_client_connect_to_server_final)
 
 int silc_client_packet_send_real(SilcClient client,
                                 SilcSocketConnection sock,
-                                int force_send)
+                                bool force_send,
+                                bool flush)
 {
   int ret;
 
   /* If rekey protocol is active we must assure that all packets are
      sent through packet queue. */
-  if (SILC_CLIENT_IS_REKEY(sock))
+  if (flush == FALSE && SILC_CLIENT_IS_REKEY(sock))
     force_send = FALSE;
 
   /* Send the packet */
@@ -635,7 +636,7 @@ SILC_TASK_CALLBACK_GLOBAL(silc_client_packet_process)
       silc_buffer_push(sock->outbuf, 
                       sock->outbuf->data - sock->outbuf->head);
 
-    ret = silc_client_packet_send_real(client, sock, TRUE);
+    ret = silc_client_packet_send_real(client, sock, TRUE, TRUE);
 
     /* If returned -2 could not write to connection now, will do
        it later. */
@@ -1129,7 +1130,7 @@ void silc_client_packet_send(SilcClient client,
                   sock->outbuf->data, sock->outbuf->len);
 
   /* Now actually send the packet */
-  silc_client_packet_send_real(client, sock, force_send);
+  silc_client_packet_send_real(client, sock, force_send, FALSE);
 }
 
 /* Closes connection to remote end. Free's all allocated data except